X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fparser.y;h=d7a02cded9f1c3214412ac47714736f5b1830dd8;hp=959890df0f4a25c93beb93e4e0ffe9f098681122;hb=7dae7dc73dfbabdc895a78738f550f56561da644;hpb=05fe1bb311ac82279ed19270b3a834f623de3004

diff --git a/src/parser.y b/src/parser.y
index 959890d..d7a02cd 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -33,6 +33,7 @@
   #define yyclassld(CS) (ir_classld_from_class(yyclass(CS)))
 }
 %define parse.error verbose
+%define parse.lac full
 %define lr.type ielr
 %define api.pure full
 %define api.push-pull push
@@ -100,13 +101,13 @@ data_spec:
   SS NAME frame_spec     { $$ = ir_framesheet($2,$3.d,$3.w,$3.h); }
 | MAP NAME frame_spec    { $$ = ir_mapsheet($2,$3.d,$3.w,$3.h); }
 | AUDIO NAME             { $$ = ir_audio($2); }
-| LINK set_ld            { $$ = ir_link_odat($2); }
-| LINK set_ld MAP        { $$ = ir_link_mdat($2,NULL); }
-| LINK set_ld MAP NAME   { $$ = ir_link_mdat($2,$4); }
-| LINK set_ld SS         { $$ = ir_link_vdat($2,NULL); }
-| LINK set_ld SS NAME    { $$ = ir_link_vdat($2,$4); }
-| LINK set_ld AUDIO      { $$ = ir_link_adat($2,NULL); }
-| LINK set_ld AUDIO NAME { $$ = ir_link_adat($2,$4); }
+| LINK set_ld            { $$ = ir_link(OLINK, $2, NULL); }
+| LINK set_ld MAP        { $$ = ir_link(MLINK, $2,NULL); }
+| LINK set_ld MAP NAME   { $$ = ir_link(MLINK, $2,$4); }
+| LINK set_ld SS         { $$ = ir_link(VLINK, $2,NULL); }
+| LINK set_ld SS NAME    { $$ = ir_link(VLINK, $2,$4); }
+| LINK set_ld AUDIO      { $$ = ir_link(ALINK, $2,NULL); }
+| LINK set_ld AUDIO NAME { $$ = ir_link(ALINK, $2,$4); }
 ;
 
 set_spec:
@@ -128,6 +129,7 @@ frame_spec:
   NUM NUM                { $$ = (struct frame_spec_t) {SFACE,$1,$2}; }
 | FACING                 { $$ = (struct frame_spec_t) {$1,0,0}; }
 | FACING NUM NUM         { $$ = (struct frame_spec_t) {$1,$2,$3}; }
+| %empty                 { $$ = (struct frame_spec_t) {SFACE,0,0}; }
 ;
 
 %%
@@ -137,7 +139,12 @@ void yyerror
 ( yycstate* cs,
   char const *s
 )
-{ fprintf(stderr, "%s\n", s); }
+{ ir_class* iter;
+  for (iter = cs->class_stack; iter < cs->csp; iter++)
+    fprintf(stderr, "%s/", ir_class_name(*iter));
+  fprintf(stderr, "\n\t");
+  fprintf(stderr, "%s\n", s);
+}
 
 yycstate* yycstate_new
 ( void )
@@ -147,24 +154,24 @@ yycstate* yycstate_new
     { yyerror(class_state, "Memory allocation error.");
       return NULL;
     }
-  class_state->csp = &class_state->class_stack[0];
-  yyclass_push(class_state, ir_class_root());
+  class_state->csp = class_state->class_stack;
+  *(class_state->csp) = ir_class_root();
   return class_state;
 }
 
 static inline
 ir_class yyclass_pop
 ( yycstate* cs )
-{ return *(cs->csp)--; }
+{ cs->csp--;
+  return *(cs->csp + 1);
+}
 
 static inline
 ir_class yyclass_push
 ( yycstate* cs,
   ir_class class
 )
-{ *++cs->csp = class;
-  return class;
-}
+{ return *++(cs->csp) = class; }
 
 void yycstate_delete
 ( yycstate* class_state )