diff options
author | Johan van Selst <johans@FreeBSD.org> | 2009-03-06 12:04:11 +0000 |
---|---|---|
committer | Johan van Selst <johans@FreeBSD.org> | 2009-03-06 12:04:11 +0000 |
commit | ec2d095bd091c2912068bffa20155527f756b57f (patch) | |
tree | c763a43d7fe92b28cdf6e5904f10ff6e66c792c3 /japanese/ming | |
parent | Update to 5.2.9 release and re-add pcre extension. (diff) |
- Update bison to 2.4.1, see announcements for important changes:
http://lists.gnu.org/archive/html/bug-bison/2008-11/msg00000.html
http://lists.gnu.org/archive/html/bug-bison/2008-12/msg00000.html
- Take over bison maintainership - as approved by portmgr (marcus)
- Add patches for ports to compile with new bison:
Replace %{ .. %} with %code { .. } where required
and accommodate stricter typing requirements
Thanks to pav for an exp-run on pointyhat
PR: ports/131640
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=229566
Diffstat (limited to 'japanese/ming')
-rw-r--r-- | japanese/ming/files/patch-src_actioncompiler_swf5compiler.y | 126 |
1 files changed, 31 insertions, 95 deletions
diff --git a/japanese/ming/files/patch-src_actioncompiler_swf5compiler.y b/japanese/ming/files/patch-src_actioncompiler_swf5compiler.y index 73b1c1812ee3..256f310123ed 100644 --- a/japanese/ming/files/patch-src_actioncompiler_swf5compiler.y +++ b/japanese/ming/files/patch-src_actioncompiler_swf5compiler.y @@ -1,96 +1,32 @@ ---- 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 @@ +--- actioncompiler/swf5compiler.y.orig 2009-03-06 11:34:48.000000000 +0100 ++++ actioncompiler/swf5compiler.y 2009-03-06 11:37:13.000000000 +0100 +@@ -239,7 +239,7 @@ expr_opt + + switch_stmt + : SWITCH '(' expr ')' '{' +- { $$ = $3; } ++ { $<action>$ = $3; } + switch_cases '}' + { bufferConcat($$, $7); + bufferResolveJumps($$); +@@ -1422,7 +1422,7 @@ opcode_list + + with + : WITH +- { $$ = bufferWriteOp(asmBuffer, ++ { $<len>$ = bufferWriteOp(asmBuffer, + SWFACTION_WITH); } + opcode_list END { $$ = $<len>2 + $3; + bufferPatchLength(asmBuffer, $3); } +@@ -1455,9 +1455,9 @@ push_list + ; + + opcode +- : PUSH { $$ = bufferWriteOp(asmBuffer, ++ : PUSH { $<len>$ = bufferWriteOp(asmBuffer, + SWFACTION_PUSHDATA); +- $$ += bufferWriteS16(asmBuffer, 0); } ++ $<len>$ += bufferWriteS16(asmBuffer, 0); } + push_list { $$ = $<len>2 + $3; + bufferPatchLength(asmBuffer, $3); } - /* 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 <intVal> INTEGER -@@ -106,26 +106,26 @@ - %left '.' '[' ']' - - --%type <action> program, code --%type <action> stmt, stmts --%type <action> if_stmt, iter_stmt, cont_stmt, break_stmt, return_stmt -+%type <action> program code -+%type <action> stmt stmts -+%type <action> if_stmt iter_stmt cont_stmt break_stmt return_stmt - %type <action> with_stmt --%type <action> switch_stmt, switch_cases, switch_case --%type <action> anon_function_decl, function_decl, anycode --%type <action> void_function_call, function_call, method_call --%type <action> assign_stmt, assign_stmts, assign_stmts_opt --%type <action> expr, expr_or_obj, objexpr, expr_opt, obj_ref --%type <action> emptybraces, level, init_vars, init_var, primary, lvalue_expr -+%type <action> switch_stmt switch_cases switch_case -+%type <action> anon_function_decl function_decl anycode -+%type <action> void_function_call function_call method_call -+%type <action> assign_stmt assign_stmts assign_stmts_opt -+%type <action> expr expr_or_obj objexpr expr_opt obj_ref -+%type <action> emptybraces level init_vars init_var primary lvalue_expr - %type <lval> lvalue - --%type <exprlist> expr_list, objexpr_list, formals_list -+%type <exprlist> expr_list objexpr_list formals_list - --%type <op> assignop, incdecop -+%type <op> assignop incdecop - %type <getURLMethod> urlmethod - - %type <str> identifier - --%type <len> opcode, opcode_list, push_item, with, push_list -+%type <len> opcode opcode_list push_item with push_list - - /* - %type <intVal> 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; } |