debug print formatting

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

diff --git a/src/parser.y b/src/parser.y
index db8e30b..d7a02cd 100644 (file)
--- 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
@@ -80,13 +81,7 @@ class_list:
 ;
 
 class:
-NAME CLOPEN   { printf("new class\n");
-                printf("class name: %s\n", $1);
-               printf("current class head: %s\n", ir_class_name(yyclass(cs)));
-               yyclass_push(cs,ir_class_addchild(yyclass(cs), $1));
-               printf("Pushed class\n");
-               printf("current class head: %s\n", ir_class_name(yyclass(cs)));
-}
+  NAME CLOPEN   { yyclass_push(cs,ir_class_addchild(yyclass(cs), $1)); }
   progn
   CLCLOSE       { yyclass_pop(cs); }
 ;
@@ -134,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}; }
 ;
 
 %%
@@ -143,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 )
@@ -161,7 +162,9 @@ yycstate* yycstate_new
 static inline
 ir_class yyclass_pop
 ( yycstate* cs )
-{ return *((cs->csp)--); }
+{ cs->csp--;
+  return *(cs->csp + 1);
+}
 
 static inline
 ir_class yyclass_push