From 01d667b3a6c88476586ec4c1be6c325dd3be2bfe Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Fri, 6 Jan 2012 16:26:37 +1000 Subject: Add more debugging stuff. --- .gitignore | 1 + LuaSL/build.sh | 8 +++++--- LuaSL/src/btyacc-c.ske | 32 ++++++++++++++++---------------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 874fdf5..7730abb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.backup *.edj *.o *.output diff --git a/LuaSL/build.sh b/LuaSL/build.sh index 9e5e2b7..2573073 100755 --- a/LuaSL/build.sh +++ b/LuaSL/build.sh @@ -51,7 +51,7 @@ names="LuaSL_main LuaSL_compile LuaSL_utilities" EDJE_FLAGS="-id images -fd fonts" -rm -f ../LuaSL ../LuaSL_parser ../*.o *.output ../*.edj LuaSL_lexer.h LuaSL_lexer.c LuaSL_yaccer.h LuaSL_yaccer.tab.c +rm -f ../LuaSL ../LuaSL_parser ../*.o *.output *.backup ../*.edj LuaSL_lexer.h LuaSL_lexer.c LuaSL_yaccer.h LuaSL_yaccer.tab.c command="edje_cc $EDJE_FLAGS LuaSL.edc ../LuaSL.edj" echo $command $command @@ -71,12 +71,14 @@ $command -names="LuaSL_parser LuaSL_LSL_tree LuaSL_lexer LuaSL_yaccer.tab" +names="LuaSL_LSL_tree LuaSL_lexer LuaSL_yaccer.tab" -command="flex --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l" +LFLAGS="-d" +command="flex -dbpv --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l" echo $command $command +# I want to remove -d, coz I want an enum, not a bunch of #defines, but btyacc creates #defines internally anyway. sigh # Should add -t as well for debugging, but it causes errors. command="btyacc -d -v -b LuaSL_yaccer -S btyacc-c.ske LuaSL_yaccer.y" echo $command diff --git a/LuaSL/src/btyacc-c.ske b/LuaSL/src/btyacc-c.ske index dc37b17..399a25c 100644 --- a/LuaSL/src/btyacc-c.ske +++ b/LuaSL/src/btyacc-c.ske @@ -272,7 +272,7 @@ int yyparse(void *YYPARSE_PARAM) { if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; if (!yys) yys = "illegal-symbol"; fprintf(stderr, "btyacc[%3d,%2d%s]: read token %d (%s)", - yystate, yydepth, (yytrial ? ",trial" : ""), yychar, yys); + yystate, (int) yydepth, (yytrial ? ",trial" : ""), yychar, yys); # ifdef YYDBPR fputc('<', stderr); YYDBPR(yylval); @@ -294,7 +294,7 @@ int yyparse(void *YYPARSE_PARAM) { # if YYDEBUG if (yydebug) { fprintf(stderr, "btyacc[%3d,%2d%s]: CONFLICT: following successful " - "trial parse\n", yystate, yydepth, (yytrial ? ",trial" :"")); + "trial parse\n", yystate, (int) yydepth, (yytrial ? ",trial" :"")); } # endif /* Switch to the next conflict context */ @@ -312,7 +312,7 @@ int yyparse(void *YYPARSE_PARAM) { # if YYDEBUG if (yydebug) { fprintf(stderr, "btyacc[%3d,%2d%s]: CONFLICT. ", - yystate, yydepth, (yytrial ? ",trial" : "")); + yystate, (int) yydepth, (yytrial ? ",trial" : "")); if(yyps->save) fputs("ALREADY in conflict, continuing trial parse.\n", stderr); else @@ -379,7 +379,7 @@ int yyparse(void *YYPARSE_PARAM) { # if YYDEBUG if (yydebug) fprintf(stderr, "btyacc[%3d,%2d%s]: shifting to state %d\n", - yystate, yydepth, (yytrial ? ",trial" : ""), yyctable[ctry]); + yystate, (int) yydepth, (yytrial ? ",trial" : ""), yyctable[ctry]); # endif if (yychar < 0) { yylvp++; yylpp++; yylexp++; @@ -402,7 +402,7 @@ int yyparse(void *YYPARSE_PARAM) { # if YYDEBUG if (yydebug) fprintf(stderr, "btyacc[%3d,%2d%s]: shifting to state %d\n", - yystate, yydepth, (yytrial ? ",trial" : ""), yytable[yyn]); + yystate, (int) yydepth, (yytrial ? ",trial" : ""), yytable[yyn]); # endif yychar = YYEMPTY; if (yyps->errflag > 0) --yyps->errflag; @@ -439,8 +439,8 @@ yyerrhandler: if (yydebug) fprintf(stderr, "btyacc[%3d,%2d%s]: ERROR, " "CONFLICT BACKTRACKING to state %d, %d tokens\n", - yystate, yydepth, (yytrial ? ",trial" : ""), - yyps->save->state, yylvp - yylvals - yyps->save->lexeme); + yystate, (int) yydepth, (yytrial ? ",trial" : ""), + yyps->save->state, (int) (yylvp - yylvals - yyps->save->lexeme)); # endif /* Memorize most forward-looking error state in case it's really an error. */ @@ -528,7 +528,7 @@ yyerrhandler: if (yydebug) fprintf(stderr, "btyacc[%3d,%2d%s]: ERROR recovery shifts to " "state %d\n", - *(yyps->ssp), yydepth, (yytrial ? ",trial" : ""), + *(yyps->ssp), (int) yydepth, (yytrial ? ",trial" : ""), yytable[yyn]); # endif /* Use label yyerrlab, so that compiler does not warn */ @@ -540,7 +540,7 @@ yyerrhandler: if (yydebug) fprintf(stderr, "btyacc[%3d,%2d%s]: ERROR recovery discards this state\n", - *(yyps->ssp), yydepth, (yytrial ? ",trial" : "")); + *(yyps->ssp), (int) yydepth, (yytrial ? ",trial" : "")); # endif if (yyps->ssp <= yyps->ss) { goto yyabort; @@ -563,7 +563,7 @@ yyerrhandler: if (!yys) yys = "illegal-symbol"; fprintf(stderr, "btyacc[%3d,%2d%s]: ERROR recovery discards token " "%d (%s)\n", - yystate, yydepth, (yytrial ? ",trial" : ""), yychar, yys); + yystate, (int) yydepth, (yytrial ? ",trial" : ""), yychar, yys); } # endif if(!yytrial) { @@ -580,7 +580,7 @@ yyreduce: # if YYDEBUG if (yydebug) { fprintf(stderr, "btyacc[%3d,%2d%s]: reducing by rule %d (%s)", - yystate, yydepth, (yytrial ? ",trial" : ""), yyn, yyrule[yyn]); + yystate, (int) yydepth, (yytrial ? ",trial" : ""), yyn, yyrule[yyn]); # ifdef YYDBPR if (yym) { int i; @@ -648,7 +648,7 @@ yyreduce: if (yydebug) { fprintf(stderr, "btyacc[ 0,%2d%s]: reduced, shifting to final state %d\n", - yydepth, (yytrial ? ",trial" : ""), YYFINAL); + (int) yydepth, (yytrial ? ",trial" : ""), YYFINAL); } # endif yystate = YYFINAL; @@ -667,7 +667,7 @@ yyreduce: if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; if (!yys) yys = "illegal-symbol"; fprintf(stderr, "btyacc[%3d,%2d%s]: read %d (%s)\n", - YYFINAL, yydepth, (yytrial ? ",trial" : ""), yychar, yys); + YYFINAL, (int) yydepth, (yytrial ? ",trial" : ""), yychar, yys); } # endif } @@ -684,7 +684,7 @@ yyreduce: # if YYDEBUG if (yydebug) fprintf(stderr, "btyacc[%3d,%2d%s]: reduced, shifting to state %d\n", - *(yyps->ssp), yydepth, (yytrial ? ",trial" : ""), yystate); + *(yyps->ssp), (int) yydepth, (yytrial ? ",trial" : ""), yystate); # endif if (yyps->ssp >= yyps->ss + yyps->stacksize - 1) { yyMoreStack(yyps); @@ -711,8 +711,8 @@ yyvalid: if (yydebug) fprintf(stderr, "btyacc[%3d,%2d%s]: CONFLICT trial successful, " "backtracking to state %d, %d tokens\n", - yystate, yydepth, (yytrial ? ",trial" : ""), - yypath->state, yylvp - yylvals - yypath->lexeme); + yystate, (int) yydepth, (yytrial ? ",trial" : ""), + yypath->state, (int) (yylvp - yylvals - yypath->lexeme)); # endif if(yyerrctx) { yyFreeState(yyerrctx); yyerrctx = 0; -- cgit v1.1