libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-14 07:48:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Lingo: Added support for parameter-less built-ins

Browse Source
This commit is contained in:
Eugene Sandulenko 2016-07-15 19:21:48 +03:00
parent 5f0f0193f9
commit 78b198cee9
8 changed files with 663 additions and 626 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/director/lingo/lingo-builtins.cpp
View File

@ -47,6 +47,8 @@ static struct BuiltinProto {
{ "chars", Lingo::b_chars, 3},
{ "length", Lingo::b_length, 1},
{ "string", Lingo::b_string, 1},
// Misc
{ "dontpassevent", Lingo::b_dontpassevent, -1 },
{ 0, 0, 0 }
};
@ -207,5 +209,11 @@ void Lingo::b_string() {
g_lingo->push(d);
}
///////////////////
// Misc
///////////////////
void Lingo::b_dontpassevent() {
warning("STUB: b_dontpassevent");
}
} // End of namespace Director

1052
engines/director/lingo/lingo-gr.cpp
View File

File diff suppressed because it is too large Load Diff

176
engines/director/lingo/lingo-gr.h
View File

@ -48,49 +48,50 @@
THEENTITYWITHID = 264,
FLOAT = 265,
BLTIN = 266,
ID = 267,
STRING = 268,
HANDLER = 269,
tDOWN = 270,
tELSE = 271,
tNLELSIF = 272,
tEND = 273,
tEXIT = 274,
tFRAME = 275,
tGLOBAL = 276,
tGO = 277,
tIF = 278,
tINTO = 279,
tLOOP = 280,
tMACRO = 281,
tMCI = 282,
tMCIWAIT = 283,
tMOVIE = 284,
tNEXT = 285,
tOF = 286,
tPREVIOUS = 287,
tPUT = 288,
tREPEAT = 289,
tSET = 290,
tTHEN = 291,
tTO = 292,
tWITH = 293,
tWHILE = 294,
tNLELSE = 295,
tFACTORY = 296,
tMETHOD = 297,
tGE = 298,
tLE = 299,
tGT = 300,
tLT = 301,
tEQ = 302,
tNEQ = 303,
tAND = 304,
tOR = 305,
tNOT = 306,
tCONCAT = 307,
tCONTAINS = 308,
tSTARTS = 309
BLTINNOARGS = 267,
ID = 268,
STRING = 269,
HANDLER = 270,
tDOWN = 271,
tELSE = 272,
tNLELSIF = 273,
tEND = 274,
tEXIT = 275,
tFRAME = 276,
tGLOBAL = 277,
tGO = 278,
tIF = 279,
tINTO = 280,
tLOOP = 281,
tMACRO = 282,
tMCI = 283,
tMCIWAIT = 284,
tMOVIE = 285,
tNEXT = 286,
tOF = 287,
tPREVIOUS = 288,
tPUT = 289,
tREPEAT = 290,
tSET = 291,
tTHEN = 292,
tTO = 293,
tWITH = 294,
tWHILE = 295,
tNLELSE = 296,
tFACTORY = 297,
tMETHOD = 298,
tGE = 299,
tLE = 300,
tGT = 301,
tLT = 302,
tEQ = 303,
tNEQ = 304,
tAND = 305,
tOR = 306,
tNOT = 307,
tCONCAT = 308,
tCONTAINS = 309,
tSTARTS = 310
};
#endif
/* Tokens. */
@ -103,49 +104,50 @@
#define THEENTITYWITHID 264
#define FLOAT 265
#define BLTIN 266
#define ID 267
#define STRING 268
#define HANDLER 269
#define tDOWN 270
#define tELSE 271
#define tNLELSIF 272
#define tEND 273
#define tEXIT 274
#define tFRAME 275
#define tGLOBAL 276
#define tGO 277
#define tIF 278
#define tINTO 279
#define tLOOP 280
#define tMACRO 281
#define tMCI 282
#define tMCIWAIT 283
#define tMOVIE 284
#define tNEXT 285
#define tOF 286
#define tPREVIOUS 287
#define tPUT 288
#define tREPEAT 289
#define tSET 290
#define tTHEN 291
#define tTO 292
#define tWITH 293
#define tWHILE 294
#define tNLELSE 295
#define tFACTORY 296
#define tMETHOD 297
#define tGE 298
#define tLE 299
#define tGT 300
#define tLT 301
#define tEQ 302
#define tNEQ 303
#define tAND 304
#define tOR 305
#define tNOT 306
#define tCONCAT 307
#define tCONTAINS 308
#define tSTARTS 309
#define BLTINNOARGS 267
#define ID 268
#define STRING 269
#define HANDLER 270
#define tDOWN 271
#define tELSE 272
#define tNLELSIF 273
#define tEND 274
#define tEXIT 275
#define tFRAME 276
#define tGLOBAL 277
#define tGO 278
#define tIF 279
#define tINTO 280
#define tLOOP 281
#define tMACRO 282
#define tMCI 283
#define tMCIWAIT 284
#define tMOVIE 285
#define tNEXT 286
#define tOF 287
#define tPREVIOUS 288
#define tPUT 289
#define tREPEAT 290
#define tSET 291
#define tTHEN 292
#define tTO 293
#define tWITH 294
#define tWHILE 295
#define tNLELSE 296
#define tFACTORY 297
#define tMETHOD 298
#define tGE 299
#define tLE 300
#define tGT 301
#define tLT 302
#define tEQ 303
#define tNEQ 304
#define tAND 305
#define tOR 306
#define tNOT 307
#define tCONCAT 308
#define tCONTAINS 309
#define tSTARTS 310
@ -162,7 +164,7 @@ typedef union YYSTYPE
int narg; /* number of arguments */
}
/* Line 1529 of yacc.c. */
#line 166 "engines/director/lingo/lingo-gr.hpp"
#line 168 "engines/director/lingo/lingo-gr.hpp"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1

11
engines/director/lingo/lingo-gr.y
View File

@ -60,7 +60,7 @@ extern int yyparse();
using namespace Director;
void yyerror(char *s) {
g_lingo->_hadError = true;
warning("%s at line %d col %d", s, g_lingo->_linenumber, g_lingo->_colnumber);
error("%s at line %d col %d", s, g_lingo->_linenumber, g_lingo->_colnumber);
}
@ -79,7 +79,7 @@ void yyerror(char *s) {
%token<i> INT
%token<e> THEENTITY THEENTITYWITHID
%token<f> FLOAT
%token<s> BLTIN ID STRING HANDLER
%token<s> BLTIN BLTINNOARGS ID STRING HANDLER
%token tDOWN tELSE tNLELSIF tEND tEXIT tFRAME tGLOBAL tGO tIF tINTO tLOOP tMACRO
%token tMCI tMCIWAIT tMOVIE tNEXT tOF tPREVIOUS tPUT tREPEAT tSET tTHEN tTO
%token tWITH tWHILE tNLELSE tFACTORY tMETHOD
@ -350,6 +350,9 @@ expr: INT {
if ($3 != g_lingo->_builtins[*$1]->nargs)
error("Built-in function %s expects %d arguments but got %d", $1->c_str(), g_lingo->_builtins[*$1]->nargs, $3);
$$ = g_lingo->code1(g_lingo->_builtins[*$1]->func);
delete $1; }
| BLTINNOARGS {
$$ = g_lingo->code1(g_lingo->_builtins[*$1]->func);
delete $1; }
| ID '(' arglist ')' {
@ -402,8 +405,8 @@ func: tMCI STRING { g_lingo->code1(g_lingo->c_mci); g_lingo->codeString($2->c_
| tMCIWAIT ID { g_lingo->code1(g_lingo->c_mciwait); g_lingo->codeString($2->c_str()); delete $2; }
| tPUT expr { g_lingo->code1(g_lingo->c_printtop); }
| gotofunc
| tEXIT { g_lingo->code2(g_lingo->c_constpush, (inst)0); // Push fake value on stack
g_lingo->code1(g_lingo->c_procret); }
| tEXIT { g_lingo->code2(g_lingo->c_constpush, (inst)0); // Push fake value on stack
g_lingo->code1(g_lingo->c_procret); }
| tGLOBAL globallist
;

26
engines/director/lingo/lingo-lex.cpp
View File

@ -1205,49 +1205,53 @@ YY_RULE_SETUP
count();
yylval.s = new Common::String(yytext);
if (g_lingo->_builtins.contains(yytext))
return BLTIN;
if (g_lingo->_builtins.contains(yytext)) {
if (g_lingo->_builtins[yytext]->nargs == -1)
return BLTINNOARGS;
else
return BLTIN;
}
return ID;
}
YY_BREAK
case 44:
YY_RULE_SETUP
#line 173 "engines/director/lingo/lingo-lex.l"
#line 177 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.f = atof(yytext); return FLOAT; }
YY_BREAK
case 45:
YY_RULE_SETUP
#line 174 "engines/director/lingo/lingo-lex.l"
#line 178 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
YY_BREAK
case 46:
YY_RULE_SETUP
#line 175 "engines/director/lingo/lingo-lex.l"
#line 179 "engines/director/lingo/lingo-lex.l"
{ count(); return *yytext; }
YY_BREAK
case 47:
/* rule 47 can match eol */
YY_RULE_SETUP
#line 176 "engines/director/lingo/lingo-lex.l"
#line 180 "engines/director/lingo/lingo-lex.l"
{ return '\n'; }
YY_BREAK
case 48:
YY_RULE_SETUP
#line 177 "engines/director/lingo/lingo-lex.l"
#line 181 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
YY_BREAK
case 49:
YY_RULE_SETUP
#line 178 "engines/director/lingo/lingo-lex.l"
#line 182 "engines/director/lingo/lingo-lex.l"
YY_BREAK
case 50:
YY_RULE_SETUP
#line 180 "engines/director/lingo/lingo-lex.l"
#line 184 "engines/director/lingo/lingo-lex.l"
ECHO;
YY_BREAK
#line 1251 "engines/director/lingo/lingo-lex.cpp"
#line 1255 "engines/director/lingo/lingo-lex.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@ -2247,7 +2251,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
#line 180 "engines/director/lingo/lingo-lex.l"
#line 184 "engines/director/lingo/lingo-lex.l"

8
engines/director/lingo/lingo-lex.l
View File

@ -165,8 +165,12 @@ whitespace [\t ]
count();
yylval.s = new Common::String(yytext);
if (g_lingo->_builtins.contains(yytext))
return BLTIN;
if (g_lingo->_builtins.contains(yytext)) {
if (g_lingo->_builtins[yytext]->nargs == -1)
return BLTINNOARGS;
else
return BLTIN;
}
return ID;
}

2
engines/director/lingo/lingo.h
View File

@ -253,6 +253,8 @@ public:
static void b_string();
static void b_tan();
static void b_dontpassevent();
void func_mci(Common::String &s);
void func_mciwait(Common::String &s);
void func_goto(Common::String &frame, Common::String &movie);

4
engines/director/lingo/tests/factory.lingo
View File

@ -37,11 +37,11 @@ method mAtFrame
dontpassevent
set the castnum of sprite 14 to bcast
set the LocV of sprite 14 to (startV-stepV)
if sprite 14 intersects 10 and (startV-6) <= targetV then
-- if sprite 14 intersects 10 and (startV-6) <= targetV then
set the castnum of sprite 14 to f16
set the perframehook to false
me(hit)
exit
-- exit
end if
if startV < targetV or bcast>g17 then
set the perframehook to false