parser pops yyclass when unexpected CLCLOSE encountered

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

diff --git a/src/parser.y b/src/parser.y
index d7a02cd..1677c6c 100644 (file)
--- a/src/parser.y
+++ b/src/parser.y
@@ -31,6 +31,7 @@
   /* Stack-based class handler */
   #define yyclass(CS)   (*(CS->csp))
   #define yyclassld(CS) (ir_classld_from_class(yyclass(CS)))
+  #define DEFAULT_VARIANT (uint8_t*)"default"
 }
 %define parse.error verbose
 %define parse.lac full
@@ -39,9 +40,9 @@
 %define api.push-pull push
 %parse-param {yycstate* cs}
 %union {
-  long long  ref;
+  uint32_t   ref;
   int        val;
-  apc_facing  face;
+  apc_facing face;
   uint8_t*   str;
   ir_class   class;
   ir_set     set;
@@ -99,7 +100,9 @@ statement:
 
 data_spec:
   SS NAME frame_spec     { $$ = ir_framesheet($2,$3.d,$3.w,$3.h); }
+| SS frame_spec          { $$ = ir_framesheet(DEFAULT_VARIANT,$2.d,$2.w,$2.h); }
 | MAP NAME frame_spec    { $$ = ir_mapsheet($2,$3.d,$3.w,$3.h); }
+| MAP frame_spec         { $$ = ir_mapsheet(DEFAULT_VARIANT,$2.d,$2.w,$2.h); }
 | AUDIO NAME             { $$ = ir_audio($2); }
 | LINK set_ld            { $$ = ir_link(OLINK, $2, NULL); }
 | LINK set_ld MAP        { $$ = ir_link(MLINK, $2,NULL); }
@@ -140,9 +143,12 @@ void yyerror
   char const *s
 )
 { ir_class* iter;
-  for (iter = cs->class_stack; iter < cs->csp; iter++)
+  fprintf(stderr, "[class->");
+  for (iter = cs->class_stack; iter <= cs->csp; iter++)
     fprintf(stderr, "%s/", ir_class_name(*iter));
-  fprintf(stderr, "\n\t");
+  if (strstr(s,"unexpected CLCLOSE") != NULL)
+    yyclass_pop(cs);
+  fprintf(stderr, "]\n\t");
   fprintf(stderr, "%s\n", s);
 }
 
@@ -162,9 +168,7 @@ yycstate* yycstate_new
 static inline
 ir_class yyclass_pop
 ( yycstate* cs )
-{ cs->csp--;
-  return *(cs->csp + 1);
-}
+{ return *cs->csp--; }
 
 static inline
 ir_class yyclass_push