[abcp commit] r72 - in trunk: examples/abcdump examples/crdlyr src

[codesite...@google.com]

Author: rdentato
Date: Tue Feb 24 10:48:00 2009
New Revision: 72

Modified:
trunk/examples/abcdump/abcdump.c
trunk/examples/crdlyr/crdlyr.c
trunk/src/abcp.h
trunk/src/abcpscan.pmx
trunk/src/abcptext.pmx

Log:

Modified: trunk/examples/abcdump/abcdump.c
==============================================================================
--- trunk/examples/abcdump/abcdump.c (original)
+++ trunk/examples/abcdump/abcdump.c Tue Feb 24 10:48:00 2009
@@ -37,10 +37,10 @@
if (f!=stdin) fclose(f);
if (abctext && *abctext) {
scn = abcScannerNew(str,abctext);
- abcScannerSetState(scn,k);
+ abcStateSet(scn,k);
/*printf("<<\n%s\n>>\n",scn->abc);*/
while ((tok = abcNextToken(scn)) != T_EOF) {
- printf("%04d %04X %04X ",abcScannerLineNumber(scn),
abcScannerCurState(scn), abcToken(scn));
+ printf("%04d %04X %04X ",abcScannerLineNumber(scn),
abcStateCurrent(scn), abcToken(scn));
switch (tok) {
case T_ANNOTATION:
printf("ANNOTATION: ");

Modified: trunk/examples/crdlyr/crdlyr.c
==============================================================================
--- trunk/examples/crdlyr/crdlyr.c (original)
+++ trunk/examples/crdlyr/crdlyr.c Tue Feb 24 10:48:00 2009
@@ -64,7 +64,7 @@
break;

case T_ENDLINE:
- if (abcScannerCurState(scn) == S_LYRICS) {
+ if (abcStateCurrent(scn) == S_LYRICS) {
while (chords_used < count_chords) {
printf("{%s}",chord_name[chords_used++]);
}
@@ -107,7 +107,7 @@
break;

case T_WHITESPACE :
- if (abcScannerCurState(scn) == S_LYRICS) printf(" ");
+ if (abcStateCurrent(scn) == S_LYRICS) printf(" ");
break;
}
}

Modified: trunk/src/abcp.h
==============================================================================
--- trunk/src/abcp.h (original)
+++ trunk/src/abcp.h Tue Feb 24 10:48:00 2009
@@ -154,11 +154,11 @@
char *abcTokenEnd(abcScanner *scn, int strnum);
int abcTokenLen(abcScanner *scn, int strnum);

-#define abcScannerCurState(s) ((s)->state)
-#define abcScannerNextState(s) ((s)->nextstate)
-#define abcScannerLineNumber(s) ((s)->ln_logical)
+#define abcStateCurrent(s) ((s)->state)
+#define abcStateNext(s) ((s)->nextstate)
+#define abcStateSet(s,t) ((s)->nextstate = (t))

-unsigned short abcScannerSetState(abcScanner *scn, unsigned short state);
+#define abcScannerLineNumber(s) ((s)->ln_logical)

int abcInclude(abcScanner *scn);

@@ -189,14 +189,13 @@
int abcNoteCourtesyAccidentals(abcScanner *scn);
int abcNoteNatural(abcScanner *scn);

-float abcNoteBending(abcScanner *scn);
-
#define abcNote2Num(c) ((tolower(c)-'c'+7) % 7)

float abcNoteDuration(abcScanner *scn);
unsigned short abcNoteOctave(abcScanner *scn);
unsigned char *abcNotePitch(abcScanner *scn);
float abcNoteCents(abcScanner *scn);
+float abcNoteBending(abcScanner *scn);

unsigned short abcNoteMidi(abcScanner *scn);
unsigned short abcNoteMidiPitchBend(abcScanner *scn);

Modified: trunk/src/abcpscan.pmx
==============================================================================
--- trunk/src/abcpscan.pmx (original)
+++ trunk/src/abcpscan.pmx Tue Feb 24 10:48:00 2009
@@ -991,7 +991,7 @@
getnewline(scn);

if (scn->cur && *scn->cur) {
- switch (abcScannerCurState(scn)) {
+ switch (abcStateCurrent(scn)) {
case S_LIMBO : return abc_limbo(scn);
case S_HEADER : return abc_header(scn);
case S_TUNE : return abc_tune(scn);
@@ -1046,13 +1046,6 @@
}
return len;
}
-
-unsigned short abcScannerSetState(abcScanner *scn, unsigned short state)
-{
- scn->nextstate = state;
- return scn->state;
-}
-

char *abcScannerGetIncludePath(abcScanner *scn)
{

Modified: trunk/src/abcptext.pmx
==============================================================================
--- trunk/src/abcptext.pmx (original)
+++ trunk/src/abcptext.pmx Tue Feb 24 10:48:00 2009
@@ -113,7 +113,7 @@
default : return '\0';
}

- switch (abcScannerCurState(scn)) {
+ switch (abcStateCurrent(scn)) {
case S_TEXT_PS : return 'P';
case S_TEXT : return 'B';
case S_HISTORY : return 'H';