From 8e97d880df96211d9faf8f5986e9e47eb9af9ef1 Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 2 Dec 2002 16:22:15 +0000 Subject: Fix build with bison 1.75. Reported by: bento --- .../files/patch-src_actioncompiler_swf4compiler.y | 26 ++++++ .../files/patch-src_actioncompiler_swf5compiler.y | 96 ++++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 japanese/ming/files/patch-src_actioncompiler_swf4compiler.y create mode 100644 japanese/ming/files/patch-src_actioncompiler_swf5compiler.y diff --git a/japanese/ming/files/patch-src_actioncompiler_swf4compiler.y b/japanese/ming/files/patch-src_actioncompiler_swf4compiler.y new file mode 100644 index 000000000000..ea4a943ab75e --- /dev/null +++ b/japanese/ming/files/patch-src_actioncompiler_swf4compiler.y @@ -0,0 +1,26 @@ +--- actioncompiler/swf4compiler.y.orig Mon Dec 2 11:10:00 2002 ++++ actioncompiler/swf4compiler.y Mon Dec 2 11:12:15 2002 +@@ -119,7 +119,6 @@ + %type expr_opt + %type void_function_call + %type function_call +-%type lhs_expr + %type pf_expr + %type lhs_expr + %type rhs_expr +@@ -140,6 +139,7 @@ + program + : elems + { *((Buffer *)buffer) = $1; } ++ ; + + elems + : elem +@@ -277,6 +277,7 @@ + bufferWriteS16($3, bufferLength($5)); + bufferConcat($3, $5); + $$ = $3; } ++ ; + + expr_opt + : /* empty */ { $$ = NULL; } diff --git a/japanese/ming/files/patch-src_actioncompiler_swf5compiler.y b/japanese/ming/files/patch-src_actioncompiler_swf5compiler.y new file mode 100644 index 000000000000..73b1c1812ee3 --- /dev/null +++ b/japanese/ming/files/patch-src_actioncompiler_swf5compiler.y @@ -0,0 +1,96 @@ +--- actioncompiler/swf5compiler.y.orig Mon Dec 2 11:13:11 2002 ++++ actioncompiler/swf5compiler.y Mon Dec 2 11:18:08 2002 +@@ -37,23 +37,23 @@ + + /* tokens etc. */ + +-%token BREAK, CONTINUE, FUNCTION, ELSE, SWITCH, CASE, FOR, IN, IF, WHILE, +- DO, VAR, NEW, DELETE, RETURN, END, WITH, ASM, EVAL ++%token BREAK CONTINUE FUNCTION ELSE SWITCH CASE FOR IN IF WHILE ++ DO VAR NEW DELETE RETURN END WITH ASM EVAL + +-%token RANDOM, GETTIMER, LENGTH, CONCAT, SUBSTR, TRACE, INT, ORD, CHR, GETURL, +- GETURL1, NEXTFRAME, PREVFRAME, PLAY, STOP, TOGGLEQUALITY, STOPSOUNDS ++%token RANDOM GETTIMER LENGTH CONCAT SUBSTR TRACE INT ORD CHR GETURL ++ GETURL1 NEXTFRAME PREVFRAME PLAY STOP TOGGLEQUALITY STOPSOUNDS + +-%token DUP, SWAP, POP, PUSH, SETREGISTER, CALLFUNCTION, CALLMETHOD, +- AND, OR, XOR, MODULO, ADD, LESSTHAN, EQUALS, +- INC, DEC, TYPEOF, ENUMERATE, INITOBJECT, INITARRAY, GETMEMBER, +- SETMEMBER, SHIFTLEFT, SHIFTRIGHT, SHIFTRIGHT2, VAREQUALS, OLDADD, SUBTRACT, +- MULTIPLY, DIVIDE, OLDEQUALS, OLDLESSTHAN, LOGICALAND, LOGICALOR, NOT, +- STRINGEQ, STRINGLENGTH, SUBSTRING, GETVARIABLE, SETVARIABLE, +- SETTARGETEXPRESSION, DUPLICATEMOVIECLIP, REMOVEMOVIECLIP, +- STRINGLESSTHAN, MBLENGTH, MBSUBSTRING, MBORD, MBCHR, +- BRANCHALWAYS, BRANCHIFTRUE, GETURL2, POST, GET, +- LOADVARIABLES, LOADMOVIE, LOADVARIABLESNUM, LOADMOVIENUM, +- CALLFRAME, STARTDRAG, STOPDRAG, GOTOFRAME, SETTARGET ++%token DUP SWAP POP PUSH SETREGISTER CALLFUNCTION CALLMETHOD ++ AND OR XOR MODULO ADD LESSTHAN EQUALS ++ INC DEC TYPEOF ENUMERATE INITOBJECT INITARRAY GETMEMBER ++ SETMEMBER SHIFTLEFT SHIFTRIGHT SHIFTRIGHT2 VAREQUALS OLDADD SUBTRACT ++ MULTIPLY DIVIDE OLDEQUALS OLDLESSTHAN LOGICALAND LOGICALOR NOT ++ STRINGEQ STRINGLENGTH SUBSTRING GETVARIABLE SETVARIABLE ++ SETTARGETEXPRESSION DUPLICATEMOVIECLIP REMOVEMOVIECLIP ++ STRINGLESSTHAN MBLENGTH MBSUBSTRING MBORD MBCHR ++ BRANCHALWAYS BRANCHIFTRUE GETURL2 POST GET ++ LOADVARIABLES LOADMOVIE LOADVARIABLESNUM LOADMOVIENUM ++ CALLFRAME STARTDRAG STOPDRAG GOTOFRAME SETTARGET + + %token NULLVAL + %token INTEGER +@@ -106,26 +106,26 @@ + %left '.' '[' ']' + + +-%type program, code +-%type stmt, stmts +-%type if_stmt, iter_stmt, cont_stmt, break_stmt, return_stmt ++%type program code ++%type stmt stmts ++%type if_stmt iter_stmt cont_stmt break_stmt return_stmt + %type with_stmt +-%type switch_stmt, switch_cases, switch_case +-%type anon_function_decl, function_decl, anycode +-%type void_function_call, function_call, method_call +-%type assign_stmt, assign_stmts, assign_stmts_opt +-%type expr, expr_or_obj, objexpr, expr_opt, obj_ref +-%type emptybraces, level, init_vars, init_var, primary, lvalue_expr ++%type switch_stmt switch_cases switch_case ++%type anon_function_decl function_decl anycode ++%type void_function_call function_call method_call ++%type assign_stmt assign_stmts assign_stmts_opt ++%type expr expr_or_obj objexpr expr_opt obj_ref ++%type emptybraces level init_vars init_var primary lvalue_expr + %type lvalue + +-%type expr_list, objexpr_list, formals_list ++%type expr_list objexpr_list formals_list + +-%type assignop, incdecop ++%type assignop incdecop + %type urlmethod + + %type identifier + +-%type opcode, opcode_list, push_item, with, push_list ++%type opcode opcode_list push_item with push_list + + /* + %type integer +@@ -144,6 +144,7 @@ + bufferConcat(b, bf); + bufferConcat(b, bc); + *((Buffer *)buffer) = b; } ++ ; + + code + : anycode +@@ -228,6 +229,7 @@ + bufferWriteS16($$, 2); + bufferWriteS16($$, bufferLength($5)); + bufferConcat($$, $5); } ++ ; + + expr_opt + : /* empty */ { $$ = NULL; } -- cgit