From 6a96a062c732963bcacfcdb3253e8f18bda80502 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 7 Mar 2017 19:34:41 +0100 Subject: DIRECTOR: Lingo: Fix parsing D4 variant of 'on ...' clause --- engines/director/lingo/lingo-gr.h | 352 +++++++++++++++++++------------------- 1 file changed, 175 insertions(+), 177 deletions(-) (limited to 'engines/director/lingo/lingo-gr.h') diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h index 38fb38e7ee..fc2959872c 100644 --- a/engines/director/lingo/lingo-gr.h +++ b/engines/director/lingo/lingo-gr.h @@ -39,185 +39,183 @@ /* Put the tokens into the symbol table, so that GDB and other debuggers know about them. */ enum yytokentype { - EOSTREAM = 258, - UNARY = 259, - CASTREF = 260, - VOID = 261, - VAR = 262, - POINT = 263, - RECT = 264, - ARRAY = 265, - OBJECT = 266, - REFERENCE = 267, - INT = 268, - THEENTITY = 269, - THEENTITYWITHID = 270, - FLOAT = 271, - BLTIN = 272, - BLTINNOARGS = 273, - BLTINNOARGSORONE = 274, - BLTINONEARG = 275, - BLTINARGLIST = 276, - TWOWORDBUILTIN = 277, - FBLTIN = 278, - FBLTINNOARGS = 279, - FBLTINONEARG = 280, - FBLTINARGLIST = 281, - RBLTIN = 282, - RBLTINONEARG = 283, - ID = 284, - STRING = 285, - HANDLER = 286, - SYMBOL = 287, - ENDCLAUSE = 288, - tPLAYACCEL = 289, - tDOWN = 290, - tELSE = 291, - tNLELSIF = 292, - tEXIT = 293, - tFRAME = 294, - tGLOBAL = 295, - tGO = 296, - tIF = 297, - tINTO = 298, - tLOOP = 299, - tMACRO = 300, - tMOVIE = 301, - tNEXT = 302, - tOF = 303, - tPREVIOUS = 304, - tPUT = 305, - tREPEAT = 306, - tSET = 307, - tTHEN = 308, - tTO = 309, - tWHEN = 310, - tWITH = 311, - tWHILE = 312, - tNLELSE = 313, - tFACTORY = 314, - tMETHOD = 315, - tOPEN = 316, - tPLAY = 317, - tDONE = 318, - tINSTANCE = 319, - tGE = 320, - tLE = 321, - tGT = 322, - tLT = 323, - tEQ = 324, - tNEQ = 325, - tAND = 326, - tOR = 327, - tNOT = 328, - tMOD = 329, - tAFTER = 330, - tBEFORE = 331, - tCONCAT = 332, - tCONTAINS = 333, - tSTARTS = 334, - tCHAR = 335, - tITEM = 336, - tLINE = 337, - tWORD = 338, - tSPRITE = 339, - tINTERSECTS = 340, - tWITHIN = 341, - tTELL = 342, - tPROPERTY = 343, - tON = 344, - tME = 345 + UNARY = 258, + CASTREF = 259, + VOID = 260, + VAR = 261, + POINT = 262, + RECT = 263, + ARRAY = 264, + OBJECT = 265, + REFERENCE = 266, + INT = 267, + THEENTITY = 268, + THEENTITYWITHID = 269, + FLOAT = 270, + BLTIN = 271, + BLTINNOARGS = 272, + BLTINNOARGSORONE = 273, + BLTINONEARG = 274, + BLTINARGLIST = 275, + TWOWORDBUILTIN = 276, + FBLTIN = 277, + FBLTINNOARGS = 278, + FBLTINONEARG = 279, + FBLTINARGLIST = 280, + RBLTIN = 281, + RBLTINONEARG = 282, + ID = 283, + STRING = 284, + HANDLER = 285, + SYMBOL = 286, + ENDCLAUSE = 287, + tPLAYACCEL = 288, + tDOWN = 289, + tELSE = 290, + tNLELSIF = 291, + tEXIT = 292, + tFRAME = 293, + tGLOBAL = 294, + tGO = 295, + tIF = 296, + tINTO = 297, + tLOOP = 298, + tMACRO = 299, + tMOVIE = 300, + tNEXT = 301, + tOF = 302, + tPREVIOUS = 303, + tPUT = 304, + tREPEAT = 305, + tSET = 306, + tTHEN = 307, + tTO = 308, + tWHEN = 309, + tWITH = 310, + tWHILE = 311, + tNLELSE = 312, + tFACTORY = 313, + tMETHOD = 314, + tOPEN = 315, + tPLAY = 316, + tDONE = 317, + tINSTANCE = 318, + tGE = 319, + tLE = 320, + tGT = 321, + tLT = 322, + tEQ = 323, + tNEQ = 324, + tAND = 325, + tOR = 326, + tNOT = 327, + tMOD = 328, + tAFTER = 329, + tBEFORE = 330, + tCONCAT = 331, + tCONTAINS = 332, + tSTARTS = 333, + tCHAR = 334, + tITEM = 335, + tLINE = 336, + tWORD = 337, + tSPRITE = 338, + tINTERSECTS = 339, + tWITHIN = 340, + tTELL = 341, + tPROPERTY = 342, + tON = 343, + tME = 344 }; #endif /* Tokens. */ -#define EOSTREAM 258 -#define UNARY 259 -#define CASTREF 260 -#define VOID 261 -#define VAR 262 -#define POINT 263 -#define RECT 264 -#define ARRAY 265 -#define OBJECT 266 -#define REFERENCE 267 -#define INT 268 -#define THEENTITY 269 -#define THEENTITYWITHID 270 -#define FLOAT 271 -#define BLTIN 272 -#define BLTINNOARGS 273 -#define BLTINNOARGSORONE 274 -#define BLTINONEARG 275 -#define BLTINARGLIST 276 -#define TWOWORDBUILTIN 277 -#define FBLTIN 278 -#define FBLTINNOARGS 279 -#define FBLTINONEARG 280 -#define FBLTINARGLIST 281 -#define RBLTIN 282 -#define RBLTINONEARG 283 -#define ID 284 -#define STRING 285 -#define HANDLER 286 -#define SYMBOL 287 -#define ENDCLAUSE 288 -#define tPLAYACCEL 289 -#define tDOWN 290 -#define tELSE 291 -#define tNLELSIF 292 -#define tEXIT 293 -#define tFRAME 294 -#define tGLOBAL 295 -#define tGO 296 -#define tIF 297 -#define tINTO 298 -#define tLOOP 299 -#define tMACRO 300 -#define tMOVIE 301 -#define tNEXT 302 -#define tOF 303 -#define tPREVIOUS 304 -#define tPUT 305 -#define tREPEAT 306 -#define tSET 307 -#define tTHEN 308 -#define tTO 309 -#define tWHEN 310 -#define tWITH 311 -#define tWHILE 312 -#define tNLELSE 313 -#define tFACTORY 314 -#define tMETHOD 315 -#define tOPEN 316 -#define tPLAY 317 -#define tDONE 318 -#define tINSTANCE 319 -#define tGE 320 -#define tLE 321 -#define tGT 322 -#define tLT 323 -#define tEQ 324 -#define tNEQ 325 -#define tAND 326 -#define tOR 327 -#define tNOT 328 -#define tMOD 329 -#define tAFTER 330 -#define tBEFORE 331 -#define tCONCAT 332 -#define tCONTAINS 333 -#define tSTARTS 334 -#define tCHAR 335 -#define tITEM 336 -#define tLINE 337 -#define tWORD 338 -#define tSPRITE 339 -#define tINTERSECTS 340 -#define tWITHIN 341 -#define tTELL 342 -#define tPROPERTY 343 -#define tON 344 -#define tME 345 +#define UNARY 258 +#define CASTREF 259 +#define VOID 260 +#define VAR 261 +#define POINT 262 +#define RECT 263 +#define ARRAY 264 +#define OBJECT 265 +#define REFERENCE 266 +#define INT 267 +#define THEENTITY 268 +#define THEENTITYWITHID 269 +#define FLOAT 270 +#define BLTIN 271 +#define BLTINNOARGS 272 +#define BLTINNOARGSORONE 273 +#define BLTINONEARG 274 +#define BLTINARGLIST 275 +#define TWOWORDBUILTIN 276 +#define FBLTIN 277 +#define FBLTINNOARGS 278 +#define FBLTINONEARG 279 +#define FBLTINARGLIST 280 +#define RBLTIN 281 +#define RBLTINONEARG 282 +#define ID 283 +#define STRING 284 +#define HANDLER 285 +#define SYMBOL 286 +#define ENDCLAUSE 287 +#define tPLAYACCEL 288 +#define tDOWN 289 +#define tELSE 290 +#define tNLELSIF 291 +#define tEXIT 292 +#define tFRAME 293 +#define tGLOBAL 294 +#define tGO 295 +#define tIF 296 +#define tINTO 297 +#define tLOOP 298 +#define tMACRO 299 +#define tMOVIE 300 +#define tNEXT 301 +#define tOF 302 +#define tPREVIOUS 303 +#define tPUT 304 +#define tREPEAT 305 +#define tSET 306 +#define tTHEN 307 +#define tTO 308 +#define tWHEN 309 +#define tWITH 310 +#define tWHILE 311 +#define tNLELSE 312 +#define tFACTORY 313 +#define tMETHOD 314 +#define tOPEN 315 +#define tPLAY 316 +#define tDONE 317 +#define tINSTANCE 318 +#define tGE 319 +#define tLE 320 +#define tGT 321 +#define tLT 322 +#define tEQ 323 +#define tNEQ 324 +#define tAND 325 +#define tOR 326 +#define tNOT 327 +#define tMOD 328 +#define tAFTER 329 +#define tBEFORE 330 +#define tCONCAT 331 +#define tCONTAINS 332 +#define tSTARTS 333 +#define tCHAR 334 +#define tITEM 335 +#define tLINE 336 +#define tWORD 337 +#define tSPRITE 338 +#define tINTERSECTS 339 +#define tWITHIN 340 +#define tTELL 341 +#define tPROPERTY 342 +#define tON 343 +#define tME 344 @@ -235,7 +233,7 @@ typedef union YYSTYPE Common::Array *arr; } /* Line 1529 of yacc.c. */ -#line 239 "engines/director/lingo/lingo-gr.hpp" +#line 237 "engines/director/lingo/lingo-gr.hpp" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -- cgit v1.2.3