diff options
| author | Eugene Sandulenko | 2016-06-18 15:20:50 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-08-03 23:40:36 +0200 |
| commit | 53dceb95f70774096a1653693286e86092f3bc0a (patch) | |
| tree | b104697de49497e36d6dceecf7287ea455075673 /engines | |
| parent | 6cb2a3cd00ea2c88564ade88707e693102e661cf (diff) | |
| download | scummvm-rg350-53dceb95f70774096a1653693286e86092f3bc0a.tar.gz scummvm-rg350-53dceb95f70774096a1653693286e86092f3bc0a.tar.bz2 scummvm-rg350-53dceb95f70774096a1653693286e86092f3bc0a.zip | |
DIRECTOR: Lingo: Swithc to warning() on syntax error, and avoid printing values
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/director/lingo/lingo-gr.cpp | 16 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-gr.y | 6 |
2 files changed, 6 insertions, 16 deletions
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp index f8209be86a..4950ee44b2 100644 --- a/engines/director/lingo/lingo-gr.cpp +++ b/engines/director/lingo/lingo-gr.cpp @@ -107,7 +107,7 @@ Common::HashMap<Common::String, int, Common::IgnoreCase_Hash, Common::IgnoreCase extern int yylex(); extern int yyparse(); -void yyerror(char *s) { error("%s", s); } +void yyerror(char *s) { warning("%s", s); } using namespace Director; @@ -1368,17 +1368,7 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 4: -#line 71 "engines/director/lingo/lingo-gr.y" - { warning("%d", (yyvsp[(1) - (1)].i)); ;} - break; - - case 5: -#line 72 "engines/director/lingo/lingo-gr.y" - { warning("%d", (yyvsp[(1) - (1)].i)); ;} - break; - - case 6: + case 6: #line 75 "engines/director/lingo/lingo-gr.y" { (yyval.i) = g_lingo->code2(g_lingo->func_constpush, (inst)(yyvsp[(1) - (1)].i)); ;} break; @@ -1450,7 +1440,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 1454 "engines/director/lingo/lingo-gr.cpp" +#line 1444 "engines/director/lingo/lingo-gr.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y index e300c5c8f5..aadcd3c11a 100644 --- a/engines/director/lingo/lingo-gr.y +++ b/engines/director/lingo/lingo-gr.y @@ -30,7 +30,7 @@ Common::HashMap<Common::String, int, Common::IgnoreCase_Hash, Common::IgnoreCase extern int yylex(); extern int yyparse(); -void yyerror(char *s) { error("%s", s); } +void yyerror(char *s) { warning("%s", s); } using namespace Director; @@ -68,8 +68,8 @@ list: statement | list '\n' statement ; -statement: expr { warning("%d", $1); } - | func { warning("%d", $1); } +statement: expr + | func ; expr: INT { $$ = g_lingo->code2(g_lingo->func_constpush, (inst)$1); } |