aboutsummaryrefslogtreecommitdiff
path: root/graphics/flasm
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2002-12-02 16:57:43 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2002-12-02 16:57:43 +0000
commit7cd12d741fcaf90d5a75600b7f3b131febb78152 (patch)
tree245f1a94ed123e36b3d98fd43389fa18b0db3fe4 /graphics/flasm
parent68f686414a87a2aebab04bfb7f340e37ccad030b (diff)
downloadports-7cd12d741fcaf90d5a75600b7f3b131febb78152.tar.gz
ports-7cd12d741fcaf90d5a75600b7f3b131febb78152.zip
Fix build with bison 1.75.
Reported by: bento
Notes
Notes: svn path=/head/; revision=71327
Diffstat (limited to 'graphics/flasm')
-rw-r--r--graphics/flasm/files/patch-assembler.y61
1 files changed, 57 insertions, 4 deletions
diff --git a/graphics/flasm/files/patch-assembler.y b/graphics/flasm/files/patch-assembler.y
index c1d555d13120..fbff08d781cb 100644
--- a/graphics/flasm/files/patch-assembler.y
+++ b/graphics/flasm/files/patch-assembler.y
@@ -1,6 +1,50 @@
---- assembler.y.orig Tue Jan 22 10:33:01 2002
-+++ assembler.y Tue Jan 22 10:33:09 2002
-@@ -491,16 +491,10 @@
+--- assembler.y.orig Sat Oct 26 01:11:50 2002
++++ assembler.y Mon Dec 2 12:00:50 2002
+@@ -254,22 +254,22 @@
+ %token SWFACTION
+ %token HEXDATA
+
+-%token '(', ')', ',', ':', '"', '.'
++%token '(' ')' ',' ':' '"' '.'
+
+ %type <str> funcname_opt
+ %type <str> mcname_opt
+-%type <len> statements, statement, statements_opt
+-%type <len> function, function_args
+-%type <len> push_list, push_item
++%type <len> statements statement statements_opt
++%type <len> function function_args
++%type <len> push_list push_item
+ %type <len> with
+-%type <len> settarget, settargetexpression, ifframeloaded, ifframeloadedexpression
+-%type <len> actionblocks, actionblock, actionblocks_opt
+-%type <len> buttoneventblocks, buttoneventblock, buttoneventblocks_opt
+-%type <len> mceventblocks, mceventblock, mceventblocks_opt
+-%type <len> mcblocks, mcblock, mcblocks_opt
+-%type <len> frame, definebutton, definemc, placemc, initmc
+-%type <len> buttonevent, buttonevents, mcevent, mcevents, key, property
+-%type <len> opcode,hex_list, hexdata_opt
++%type <len> settarget settargetexpression ifframeloaded ifframeloadedexpression
++%type <len> actionblocks actionblock actionblocks_opt
++%type <len> buttoneventblocks buttoneventblock buttoneventblocks_opt
++%type <len> mceventblocks mceventblock mceventblocks_opt
++%type <len> mcblocks mcblock mcblocks_opt
++%type <len> frame definebutton definemc placemc initmc
++%type <len> buttonevent buttonevents mcevent mcevents key property
++%type <len> opcode hex_list hexdata_opt
+ %type <num> urlmethod
+
+ %%
+@@ -447,7 +447,7 @@
+ ;
+
+ mcevent
+- : /* empty */ { yyerror("Missing mc event condition") }
++ : /* empty */ { yyerror("Missing mc event condition"); }
+ | MCLOAD { $$ = 0x01; }
+ | MCENTERFRAME { $$ = 0x02; }
+ | MCUNLOAD { $$ = 0x04; }
+@@ -551,16 +551,10 @@
: SETTARGET STRING { $$ = writeByte(SWFACTION_SETTARGET);
$$ += writeShort(strlen($2)+1);
$$ += writeString($2); }
@@ -16,4 +60,13 @@
- $$ += writeByte(0); }
;
- push_item
+ ifframeloadedexpression
+@@ -849,7 +843,7 @@
+
+ | GOTOFRAME INTEGER { $$ = writeByte(SWFACTION_GOTOFRAME);
+ $$ += writeShort(2);
+- $$ += writeShort(atoi($2)) }
++ $$ += writeShort(atoi($2)); }
+
+ | GETURL STRING STRING { $$ = writeByte(SWFACTION_GETURL);
+ $$ += writeShort(strlen($2)+strlen($3)+2);