diff options
| author | Eugene Sandulenko | 2016-06-21 19:34:45 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-08-03 23:40:36 +0200 |
| commit | 0f3295c98f1bf846e0e7183d4fbafb1a767de75f (patch) | |
| tree | 9777d95bfdf5e69bd8fce143179dccda24524446 /engines/director/lingo/lingo-gr.y | |
| parent | ad9e2fd0e5aa02f5d2ff08034a40f220c604c3cf (diff) | |
| download | scummvm-rg350-0f3295c98f1bf846e0e7183d4fbafb1a767de75f.tar.gz scummvm-rg350-0f3295c98f1bf846e0e7183d4fbafb1a767de75f.tar.bz2 scummvm-rg350-0f3295c98f1bf846e0e7183d4fbafb1a767de75f.zip | |
DIRECTOR: Lingo: Initial code for 'repeat with' control keyword
Diffstat (limited to 'engines/director/lingo/lingo-gr.y')
| -rw-r--r-- | engines/director/lingo/lingo-gr.y | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y index 179359c87e..eb584609d0 100644 --- a/engines/director/lingo/lingo-gr.y +++ b/engines/director/lingo/lingo-gr.y @@ -73,11 +73,11 @@ using namespace Director; %token<i> INT %token<f> FLOAT %token<s> VAR STRING -%token tIF tELSE tEND tFRAME tGO tINTO tLOOP tMCI tMCIWAIT tMOVIE tNEXT tOF tPREVIOUS -%token tPUT tREPEAT tSET tTHEN tTO tWHILE +%token tDOWN tELSE tEND tFRAME tGO tIF tINTO tLOOP tMCI tMCIWAIT tMOVIE tNEXT +%token tOF tPREVIOUS tPUT tREPEAT tSET tTHEN tTO tWITH tWHILE %token tGE tLE tGT tLT tEQ tNEQ -%type<code> asgn cond expr if end stmtlist while +%type<code> asgn cond end expr if repeatwhile repeatwith stmtlist %type<s> gotoframe gotomovie %right '=' @@ -125,19 +125,44 @@ stmt: expr { g_lingo->code1(g_lingo->c_xpop); } // statements // end repeat // - | while '(' cond ')' stmtlist end tEND tREPEAT { + | repeatwhile '(' cond ')' stmtlist end tEND tREPEAT { inst body, end; WRITE_LE_UINT32(&body, $5); WRITE_LE_UINT32(&end, $6); (*g_lingo->_currentScript)[$1 + 1] = body; /* body of loop */ (*g_lingo->_currentScript)[$1 + 2] = end; } /* end, if cond fails */ ; + // repeat with index = start to end + // statements + // end repeat + // + // repeat with index = high down to low + // statements + // end repeat + // + | repeatwith '=' expr tTO expr stmtlist end tEND tREPEAT { + inst init, finish, body, end; + WRITE_LE_UINT32(&init, $3); + WRITE_LE_UINT32(&finish, $5); + WRITE_LE_UINT32(&body, $6); + WRITE_LE_UINT32(&end, $7); + (*g_lingo->_currentScript)[$1 + 1] = init; /* initial count value */ + (*g_lingo->_currentScript)[$1 + 2] = finish;/* final count value */ + (*g_lingo->_currentScript)[$1 + 3] = body; /* body of loop */ + (*g_lingo->_currentScript)[$1 + 4] = end; } /* end, if cond fails */ + ; cond: expr { g_lingo->code1(STOP); } | expr '=' expr { g_lingo->code2(g_lingo->c_eq, STOP); } | '(' cond ')' ; -while: tREPEAT tWHILE { $$ = g_lingo->code3(g_lingo->c_whilecode, STOP, STOP); } +repeatwhile: tREPEAT tWHILE { $$ = g_lingo->code3(g_lingo->c_repeatwhilecode, STOP, STOP); } + ; +repeatwith: tREPEAT tWITH VAR { + $$ = g_lingo->code3(g_lingo->c_repeatwithcode, STOP, STOP); + g_lingo->code2(STOP, STOP); + g_lingo->codeString($3->c_str()); + delete $3; } ; if: tIF { $$ = g_lingo->code1(g_lingo->c_ifcode); g_lingo->code3(STOP, STOP, STOP); } ; @@ -198,15 +223,6 @@ gotomovie: tOF tMOVIE STRING { $$ = $3; } | tTO tMOVIE STRING { $$ = $3; } ; -// repeat with index = start to end -// statements -// end repeat -// -// repeat with index = high down to low -// statements -// end repeat -// - // macro // // Special Note The macro keyword is retained in Director 3.0 to maintain compatibility |