X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fparser.y;h=2c74db709d4d58208bdcadb15920cdb57d33f6de;hp=881b5628a993341f34659b1febfe91a692abeb38;hb=HEAD;hpb=e957af2c23e57f97591580aff0b7835eb4af1dc2

diff --git a/src/parser.y b/src/parser.y
index 881b562..2c74db7 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -5,7 +5,7 @@
   #include "ir.h"
   #include "apc.h"
   typedef struct class_state_t yycstate;
-  struct frame_spec_t { apc_facing d; int w, h; };
+  struct frame_spec_t { facinglist list; int w, h; };
 }
 %code provides {
   yycstate* yycstate_new(void);
@@ -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
@@ -48,6 +49,7 @@
   ir_setld   ld;
   ir_setdata data;
   struct frame_spec_t frame_spec;
+  facinglist facinglist;
 }
 /* Operators */
 %token        CLOPEN    //(
@@ -63,15 +65,17 @@
 %token <face> FACING
 %token <str>  NAME
 /* Types */
-%type<data>       data_spec
-%type<set>        set_spec
-%type<ld>         set_ld set_link
-%type<frame_spec> frame_spec
+%type<data>        data_spec
+%type<set>         set_spec
+%type<ld>          set_ld set_link
+%type<frame_spec>  frame_spec
+%type<facinglist>  facing_list
 %%
 /* Syntax Directed Translation Scheme of the APC grammar */
 progn:
   class_list 
 | class_list statement_list
+| statement_list class_list
 | statement_list
 ;
 
@@ -84,7 +88,6 @@ class:
   NAME CLOPEN   { yyclass_push(cs,ir_class_addchild(yyclass(cs), $1)); }
   progn
   CLCLOSE       { yyclass_pop(cs); }
-| CLCLOSE       { yyclass_pop(cs); }
 ;
 
 statement_list:
@@ -92,15 +95,17 @@ statement_list:
 | statement    
 ;
 
-statement:
+   statement:
   set_spec data_spec REF PATH { ir_data_assign_path($2,$4); ir_set_assign_data($1,$2); ir_set_assign_ref($1,$3); }
 | set_spec data_spec PATH     { ir_data_assign_path($2,$3); ir_set_assign_data($1,$2); }
 | set_spec REF PATH           { ir_set_assign_ref($1,$2); }
 ;
 
 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); }
+  SS NAME frame_spec     { $$ = ir_framesheet($2,$3.list,$3.w,$3.h); }
+| SS frame_spec          { $$ = ir_framesheet(DEFAULT_VARIANT,$2.list,$2.w,$2.h); }
+| MAP NAME frame_spec    { $$ = ir_mapsheet($2,$3.list,$3.w,$3.h); }
+| MAP frame_spec         { $$ = ir_mapsheet(DEFAULT_VARIANT,$2.list,$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); }
@@ -126,11 +131,15 @@ set_ld:
 | REF                    { $$ = ir_setld_from_ref($1); }
 ;
 
+facing_list:
+  facing_list FACING     { $$ = ir_facinglist_push($1,$2); }
+| FACING                 { $$ = ir_facinglist($1); }
+
 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}; }
+  NUM NUM                { $$ = (struct frame_spec_t) {NULL,$1,$2}; }
+| facing_list            { $$ = (struct frame_spec_t) {$1,0,0}; }
+| facing_list NUM NUM    { $$ = (struct frame_spec_t) {$1,$2,$3}; }
+| %empty                 { $$ = (struct frame_spec_t) {NULL,0,0}; }
 ;
 
 %%
@@ -142,8 +151,10 @@ void yyerror
 )
 { ir_class* iter;
   fprintf(stderr, "[class->");
-  for (iter = cs->class_stack; iter < cs->csp; iter++)
+  for (iter = cs->class_stack; iter <= cs->csp; iter++)
     fprintf(stderr, "%s/", ir_class_name(*iter));
+  if (strstr(s,"unexpected CLCLOSE") != NULL)
+    yyclass_pop(cs);
   fprintf(stderr, "]\n\t");
   fprintf(stderr, "%s\n", s);
 }
@@ -164,9 +175,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