libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 17:46:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Lingo: Added generic built-in procedures

Browse Source
This commit is contained in:
Eugene Sandulenko 2016-08-05 23:13:01 +02:00
parent 464f360e97
commit 05b4f29932
7 changed files with 745 additions and 664 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/director/lingo/lingo-code.cpp
View File

@ -121,6 +121,13 @@ void Lingo::c_constpush() {
g_lingo->push(d);
}
void Lingo::c_voidpush() {
Datum d;
d.u.i = 0;
d.type = VOID;
g_lingo->push(d);
}
void Lingo::c_fconstpush() {
Datum d;
inst i = (*g_lingo->_currentScript)[g_lingo->_pc];

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

File diff suppressed because it is too large Load Diff

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

@ -53,59 +53,61 @@
FLOAT = 269,
BLTIN = 270,
BLTINNOARGS = 271,
ID = 272,
STRING = 273,
HANDLER = 274,
tDOWN = 275,
tELSE = 276,
tNLELSIF = 277,
tEND = 278,
tEXIT = 279,
tFRAME = 280,
tGLOBAL = 281,
tGO = 282,
tIF = 283,
tINTO = 284,
tLOOP = 285,
tMACRO = 286,
tMCI = 287,
tMCIWAIT = 288,
tMOVIE = 289,
tNEXT = 290,
tOF = 291,
tPREVIOUS = 292,
tPUT = 293,
tREPEAT = 294,
tSET = 295,
tTHEN = 296,
tTO = 297,
tWHEN = 298,
tWITH = 299,
tWHILE = 300,
tNLELSE = 301,
tFACTORY = 302,
tMETHOD = 303,
tALERT = 304,
tBEEP = 305,
tCLOSERESFILE = 306,
tCLOSEXLIB = 307,
tCURSOR = 308,
tDELAY = 309,
tGE = 310,
tLE = 311,
tGT = 312,
tLT = 313,
tEQ = 314,
tNEQ = 315,
tAND = 316,
tOR = 317,
tNOT = 318,
tCONCAT = 319,
tCONTAINS = 320,
tSTARTS = 321,
tSPRITE = 322,
tINTERSECTS = 323,
tWITHIN = 324
BLTINNOARGSORONE = 272,
BLTINONEARG = 273,
ID = 274,
STRING = 275,
HANDLER = 276,
tDOWN = 277,
tELSE = 278,
tNLELSIF = 279,
tEND = 280,
tEXIT = 281,
tFRAME = 282,
tGLOBAL = 283,
tGO = 284,
tIF = 285,
tINTO = 286,
tLOOP = 287,
tMACRO = 288,
tMCI = 289,
tMCIWAIT = 290,
tMOVIE = 291,
tNEXT = 292,
tOF = 293,
tPREVIOUS = 294,
tPUT = 295,
tREPEAT = 296,
tSET = 297,
tTHEN = 298,
tTO = 299,
tWHEN = 300,
tWITH = 301,
tWHILE = 302,
tNLELSE = 303,
tFACTORY = 304,
tMETHOD = 305,
tALERT = 306,
tBEEP = 307,
tCLOSERESFILE = 308,
tCLOSEXLIB = 309,
tCURSOR = 310,
tDELAY = 311,
tGE = 312,
tLE = 313,
tGT = 314,
tLT = 315,
tEQ = 316,
tNEQ = 317,
tAND = 318,
tOR = 319,
tNOT = 320,
tCONCAT = 321,
tCONTAINS = 322,
tSTARTS = 323,
tSPRITE = 324,
tINTERSECTS = 325,
tWITHIN = 326
};
#endif
/* Tokens. */
@ -123,59 +125,61 @@
#define FLOAT 269
#define BLTIN 270
#define BLTINNOARGS 271
#define ID 272
#define STRING 273
#define HANDLER 274
#define tDOWN 275
#define tELSE 276
#define tNLELSIF 277
#define tEND 278
#define tEXIT 279
#define tFRAME 280
#define tGLOBAL 281
#define tGO 282
#define tIF 283
#define tINTO 284
#define tLOOP 285
#define tMACRO 286
#define tMCI 287
#define tMCIWAIT 288
#define tMOVIE 289
#define tNEXT 290
#define tOF 291
#define tPREVIOUS 292
#define tPUT 293
#define tREPEAT 294
#define tSET 295
#define tTHEN 296
#define tTO 297
#define tWHEN 298
#define tWITH 299
#define tWHILE 300
#define tNLELSE 301
#define tFACTORY 302
#define tMETHOD 303
#define tALERT 304
#define tBEEP 305
#define tCLOSERESFILE 306
#define tCLOSEXLIB 307
#define tCURSOR 308
#define tDELAY 309
#define tGE 310
#define tLE 311
#define tGT 312
#define tLT 313
#define tEQ 314
#define tNEQ 315
#define tAND 316
#define tOR 317
#define tNOT 318
#define tCONCAT 319
#define tCONTAINS 320
#define tSTARTS 321
#define tSPRITE 322
#define tINTERSECTS 323
#define tWITHIN 324
#define BLTINNOARGSORONE 272
#define BLTINONEARG 273
#define ID 274
#define STRING 275
#define HANDLER 276
#define tDOWN 277
#define tELSE 278
#define tNLELSIF 279
#define tEND 280
#define tEXIT 281
#define tFRAME 282
#define tGLOBAL 283
#define tGO 284
#define tIF 285
#define tINTO 286
#define tLOOP 287
#define tMACRO 288
#define tMCI 289
#define tMCIWAIT 290
#define tMOVIE 291
#define tNEXT 292
#define tOF 293
#define tPREVIOUS 294
#define tPUT 295
#define tREPEAT 296
#define tSET 297
#define tTHEN 298
#define tTO 299
#define tWHEN 300
#define tWITH 301
#define tWHILE 302
#define tNLELSE 303
#define tFACTORY 304
#define tMETHOD 305
#define tALERT 306
#define tBEEP 307
#define tCLOSERESFILE 308
#define tCLOSEXLIB 309
#define tCURSOR 310
#define tDELAY 311
#define tGE 312
#define tLE 313
#define tGT 314
#define tLT 315
#define tEQ 316
#define tNEQ 317
#define tAND 318
#define tOR 319
#define tNOT 320
#define tCONCAT 321
#define tCONTAINS 322
#define tSTARTS 323
#define tSPRITE 324
#define tINTERSECTS 325
#define tWITHIN 326
@ -193,7 +197,7 @@ typedef union YYSTYPE
Common::Array<double> *arr;
}
/* Line 1529 of yacc.c. */
#line 197 "engines/director/lingo/lingo-gr.hpp"
#line 201 "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

@ -81,7 +81,7 @@ void yyerror(char *s) {
%token<i> INT
%token<e> THEENTITY THEENTITYWITHID
%token<f> FLOAT
%token<s> BLTIN BLTINNOARGS ID STRING HANDLER
%token<s> BLTIN BLTINNOARGS BLTINNOARGSORONE BLTINONEARG 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 tWHEN
%token tWITH tWHILE tNLELSE tFACTORY tMETHOD tALERT tBEEP tCLOSERESFILE tCLOSEXLIB
@ -404,6 +404,15 @@ func: tMCI STRING { g_lingo->code1(g_lingo->c_mci); g_lingo->codeString($2->c_
| tEXIT { g_lingo->codeConst(0); // Push fake value on stack
g_lingo->code1(g_lingo->c_procret); }
| tGLOBAL globallist
| BLTINONEARG expr {
g_lingo->code1(g_lingo->_handlers[*$1]->u.func);
delete $1; }
| BLTINNOARGSORONE expr {
g_lingo->code1(g_lingo->_handlers[*$1]->u.func);
delete $1; }
| BLTINNOARGSORONE {
g_lingo->code2(g_ling->c_voidpush, g_lingo->_handlers[*$1]->u.func);
delete $1; }
| tALERT expr { g_lingo->code1(g_lingo->c_alert); }
| tBEEP INT {
g_lingo->codeConst($2);

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

@ -1303,8 +1303,21 @@ YY_RULE_SETUP
yylval.s = new Common::String(yytext);
if (g_lingo->_handlers.contains(yytext)) {
if (g_lingo->_handlers[yytext]->type == BLTIN && g_lingo->_handlers[yytext]->nargs == -1)
if (g_lingo->_handlers[yytext]->type == BLTIN && g_lingo->_handlers[yytext]->parens == false) {
if (g_lingo->_handlers[yytext]->nargs == 0) {
if (g_lingo->_handlers[yytext]->maxArgs == 0)
return BLTINNOARGS;
else if (g_lingo->_handlers[yytext]->maxArgs == 1)
return BLTINNOARGSORONE;
else
error("Incorrect setup for builtin: %s", yytext);
} else if (g_lingo->_handlers[yytext]->nargs == 1 &&
g_lingo->_handlers[yytext]->maxArgs == 1) {
return BLTINONEARG;
} else {
error("Incorrect setup for builtin: %s", yytext);
}
}
}
return ID;
@ -1312,41 +1325,41 @@ YY_RULE_SETUP
YY_BREAK
case 54:
YY_RULE_SETUP
#line 194 "engines/director/lingo/lingo-lex.l"
#line 207 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.f = atof(yytext); return FLOAT; }
YY_BREAK
case 55:
YY_RULE_SETUP
#line 195 "engines/director/lingo/lingo-lex.l"
#line 208 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
YY_BREAK
case 56:
YY_RULE_SETUP
#line 196 "engines/director/lingo/lingo-lex.l"
#line 209 "engines/director/lingo/lingo-lex.l"
{ count(); return *yytext; }
YY_BREAK
case 57:
/* rule 57 can match eol */
YY_RULE_SETUP
#line 197 "engines/director/lingo/lingo-lex.l"
#line 210 "engines/director/lingo/lingo-lex.l"
{ return '\n'; }
YY_BREAK
case 58:
YY_RULE_SETUP
#line 198 "engines/director/lingo/lingo-lex.l"
#line 211 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
YY_BREAK
case 59:
YY_RULE_SETUP
#line 199 "engines/director/lingo/lingo-lex.l"
#line 212 "engines/director/lingo/lingo-lex.l"
YY_BREAK
case 60:
YY_RULE_SETUP
#line 201 "engines/director/lingo/lingo-lex.l"
#line 214 "engines/director/lingo/lingo-lex.l"
ECHO;
YY_BREAK
#line 1350 "engines/director/lingo/lingo-lex.cpp"
#line 1363 "engines/director/lingo/lingo-lex.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@ -2346,7 +2359,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
#line 201 "engines/director/lingo/lingo-lex.l"
#line 214 "engines/director/lingo/lingo-lex.l"

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

@ -185,11 +185,21 @@ whitespace [\t ]
yylval.s = new Common::String(yytext);
if (g_lingo->_handlers.contains(yytext)) {
if (g_lingo->_handlers[yytext]->type == BLTIN &&
g_lingo->_handlers[yytext]->nargs == 0 &&
g_lingo->_handlers[yytext]->maxArgs == 0 &&
!g_lingo->_handlers[yytext]->parens)
if (g_lingo->_handlers[yytext]->type == BLTIN && g_lingo->_handlers[yytext]->parens == false) {
if (g_lingo->_handlers[yytext]->nargs == 0) {
if (g_lingo->_handlers[yytext]->maxArgs == 0)
return BLTINNOARGS;
else if (g_lingo->_handlers[yytext]->maxArgs == 1)
return BLTINNOARGSORONE;
else
error("Incorrect setup for builtin: %s", yytext);
} else if (g_lingo->_handlers[yytext]->nargs == 1 &&
g_lingo->_handlers[yytext]->maxArgs == 1) {
return BLTINONEARG;
} else {
error("Incorrect setup for builtin: %s", yytext);
}
}
}
return ID;

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

@ -216,6 +216,7 @@ public:
static void c_within();
static void c_constpush();
static void c_voidpush();
static void c_fconstpush();
static void c_stringpush();
static void c_varpush();