diff options
| author | Eugene Sandulenko | 2016-06-28 18:41:19 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-08-03 23:40:36 +0200 |
| commit | 9fff6529a3a3955a1a7201398ecf3f1a90871399 (patch) | |
| tree | 9b7b21c8134103b75701b79995718bb1aea433a2 /engines/director/lingo/lingo-gr.y | |
| parent | 839ac90f615e1cda46db0ec7ed864e67c8b9631b (diff) | |
| download | scummvm-rg350-9fff6529a3a3955a1a7201398ecf3f1a90871399.tar.gz scummvm-rg350-9fff6529a3a3955a1a7201398ecf3f1a90871399.tar.bz2 scummvm-rg350-9fff6529a3a3955a1a7201398ecf3f1a90871399.zip | |
DIRECTOR: Lingo: SImplified arg processing at macro definition.
Diffstat (limited to 'engines/director/lingo/lingo-gr.y')
| -rw-r--r-- | engines/director/lingo/lingo-gr.y | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y index 0ffa2d4b7a..3c716a5109 100644 --- a/engines/director/lingo/lingo-gr.y +++ b/engines/director/lingo/lingo-gr.y @@ -78,7 +78,7 @@ using namespace Director; %token tMOVIE tNEXT tOF tPREVIOUS tPUT tREPEAT tSET tTHEN tTO tWITH tWHILE %token tGE tLE tGT tLT tEQ tNEQ -%type<code> argbegin asgn begin cond end expr if repeatwhile repeatwith stmtlist +%type<code> asgn begin cond end expr if repeatwhile repeatwith stmtlist %type<s> gotoframe gotomovie %type<narg> argdef arglist @@ -308,7 +308,7 @@ gotomovie: tOF tMOVIE STRING { $$ = $3; } // See also: // on keyword defn: tMACRO ID { g_lingo->_indef = true; } - argbegin argdef '\n' argstore stmtlist { + begin argdef '\n' argstore stmtlist { g_lingo->code1(g_lingo->c_procret); g_lingo->define(*$2, $4, $5); g_lingo->_indef = false; } @@ -318,8 +318,6 @@ argdef: /* nothing */ { $$ = 0; } | argdef ',' ID { g_lingo->codeArg($3); $$ = $1 + 1; } | argdef '\n' ',' ID { g_lingo->codeArg($4); $$ = $1 + 1; } ; -argbegin: /* nothing */ { g_lingo->codeArg(new Common::String("<args>")); $$ = g_lingo->_currentScript->size(); } - ; argstore: /* nothing */ { g_lingo->codeArgStore(); } ; |