debug print formatting

[henge/apc.git] / src / parser.y

diff --git a/src/parser.y b/src/parser.y
index 41c4095..d7a02cd 100644 (file)
--- a/src/parser.y
+++ b/src/parser.y
@@ -3,8 +3,9 @@
 %code requires {
   #include <unitypes.h>
   #include "ir.h"
+  #include "apc.h"
   typedef struct class_state_t yycstate;
-  struct frame_spec_t { ir_facing d; int w, h; };
+  struct frame_spec_t { apc_facing d; int w, h; };
 }
 %code provides {
   yycstate* yycstate_new(void);
@@ -16,7 +17,7 @@
   #include <dirent.h>
   #include <unitypes.h>
   #include "ir.h"
-
+  
   struct class_state_t {
     ir_class *csp;
     ir_class class_stack[];
@@ -32,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
@@ -39,7 +41,7 @@
 %union {
   long long  ref;
   int        val;
-  ir_facing  face;
+  apc_facing  face;
   uint8_t*   str;
   ir_class   class;
   ir_set     set;
@@ -99,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:
@@ -127,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}; }
 ;
 
 %%
@@ -136,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 )
@@ -146,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 )