--- capa/capa51/pProj/capaLexerDef.flex 1999/12/07 19:10:47 1.5 +++ capa/capa51/pProj/capaLexerDef.flex 2000/02/22 18:19:02 1.6 @@ -352,10 +352,10 @@ EndLine ([\r][\n]|[\n]) %k 10000 %p 10000 %n 1000 -%x S_COMMENT S_HINT S_HINTEXLAINX S_IMPORT S_EXPLAIN S_ENDX S_UNIT S_IGNORE -%x S_SKIP S_VARIABLE S_LET S_DEFINE S_TEXT S_MAP S_FIGURE S_ANSWER -%x S_STRING S_ANSCONTINUE S_TRUE_FALSE_STMT S_IF_SKIP S_WHILE_SKIP -%x S_NEXT_LINE S_RANDOMORDER S_VERB +%x S_COMMENT S_HINT S_HINTEXLAINX S_IMPORT S_EXPLAIN S_ENDX S_UNIT S_IGNORE +%x S_SKIP S_VARIABLE S_LET S_DEFINE S_TEXT S_MAP S_FIGURE S_ANSWER +%x S_STRING S_ANSCONTINUE S_TRUE_FALSE_STMT S_IF_SKIP S_WHILE_SKIP +%x S_NEXT_LINE S_RANDOMORDER S_VERB %array @@ -849,7 +849,7 @@ EndLine ([\r][\n]|[\n]) } { -[\)] { LLDBUG_PR1("[) in TRUE_FALSE]"); Pcount--; if(Pcount == 0) BEGIN S_NEXT_LINE; return(yytext[0]); } +[\)] { LLDBUG_PRL1("[) in TRUE_FALSE]"); Pcount--; if(Pcount == 0) BEGIN S_NEXT_LINE; return(yytext[0]); } [\\]{Space}*{EndLine} { LLDBUG_PR2("[\\EoL continue in S_TRUE_FALSE_STMT](%s)",yytext); /* continuation on next line */ } {EndLine} { LLDBUG_PR1("[EoL within /IF()]\n"); RETURN(EoL); } . { char warn_msg[WARN_MSG_LENGTH]; @@ -949,7 +949,10 @@ EndLine ([\r][\n]|[\n]) [^\n]*$ { LLDBUG_PRL2("[SkipIF anything ]",IFcount); } } { -([.]*){EndLine} { /* this ignores everything until it hits an EoL */ BEGIN S_TEXT; } +([.]*){EndLine} { /* this ignores everything until it hits an EoL */ + LLDBUG_PRL2("[ skip \'%s\' until EoL]\n",yytext); + BEGIN S_TEXT; + } } { @@ -1526,8 +1529,9 @@ char* parser_status() void yyfatalerror(char*msg) { char warn_msg[WARN_MSG_LENGTH]; - sprintf(warn_msg,"Invalid character[%s]\n",yytext); + sprintf(warn_msg,"Invalid character[\'%s\']\n",yytext); capa_msg(MESSAGE_ERROR,warn_msg); + capa_msg(MESSAGE_ERROR,msg); } void yyerror(char* msg) {