X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fparser.y;h=e1fe89651eb15c4f9f1878f5f5351b602ffe4e86;hp=9fe82df01a281f717e99f39fe5a55ed71d8ba20f;hb=fc6b15eee27f77e01ed4a24bc11e7bfa5a812342;hpb=c719f3e6c6663f6640422d81c156231c84cdcbdf

diff --git a/src/parser.y b/src/parser.y
index 9fe82df..e1fe896 100644
--- 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[];
@@ -24,22 +25,24 @@
 
   extern long     sys_pagesize;
   extern int      lexer();
-  static void     yyerror(char const*);
+  static void     yyerror(yycstate*, char const*);
+  static inline ir_class yyclass_push(yycstate*, ir_class);
+  static inline ir_class yyclass_pop(yycstate*);
   /* Stack-based class handler */
-  #define CLASS_POP(CS) (*--(CS-csp))
-  #define CLASS_PUSH(CS,CL) (*(CS->csp)++ = CL)
   #define yyclass(CS)   (*(CS->csp))
   #define yyclassld(CS) (ir_classld_from_class(yyclass(CS)))
+  #define DEFAULT_VARIANT "default"
 }
 %define parse.error verbose
+%define parse.lac full
 %define lr.type ielr
 %define api.pure full
 %define api.push-pull push
 %parse-param {yycstate* cs}
 %union {
-  long long  ref;
+  uint32_t   ref;
   int        val;
-  ir_facing  face;
+  apc_facing face;
   uint8_t*   str;
   ir_class   class;
   ir_set     set;
@@ -79,9 +82,10 @@ class_list:
 ;
 
 class:
-  NAME CLOPEN   { CLASS_PUSH(cs,ir_class_addchild(yyclass, $1)); }
+  NAME CLOPEN   { yyclass_push(cs,ir_class_addchild(yyclass(cs), $1)); }
   progn
-  CLCLOSE       { CLASS_POP(cs); }
+  CLCLOSE       { yyclass_pop(cs); }
+| CLCLOSE       { yyclass_pop(cs); }
 ;
 
 statement_list:
@@ -97,25 +101,27 @@ 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_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:
-  set_spec NAME          { $$ = ir_set_addchild($1,$2);      }
-| NAME                   { $$ = ir_class_addset(yyclass,$1); }
+  set_spec NAME          { $$ = ir_set_addchild($1,$2); }
+| NAME                   { $$ = ir_class_addset(yyclass(cs),$1); }
 ;
 
 set_link:
   set_link NAME          { $$ = ir_setld_addchild($1,$2); }
-| NAME                   { $$ = ir_setld_from_classld(yyclassld,$1) }
+| NAME                   { $$ = ir_setld_from_classld(yyclassld(cs),$1); }
 ;
 
 set_ld:
@@ -127,28 +133,51 @@ 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}; }
 ;
 
 %%
 
 static
 void yyerror
-( char const *s )
-{ fprintf(stderr, "%s\n", s); }
+( yycstate* cs,
+  char const *s
+)
+{ ir_class* iter;
+  fprintf(stderr, "[class->");
+  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 )
 { yycstate* class_state;
   class_state = (yycstate*) malloc((size_t) sys_pagesize);
   if(class_state == NULL)
-    { yyerror(ERR_MEM);
-      exit(1);
+    { yyerror(class_state, "Memory allocation error.");
+      return NULL;
     }
-  class_state->csp = &class_state->class_stack[0];
-  CLASS_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 )
+{ cs->csp--;
+  return *(cs->csp + 1);
+}
+
+static inline
+ir_class yyclass_push
+( yycstate* cs,
+  ir_class class
+)
+{ return *++(cs->csp) = class; }
+
 void yycstate_delete
 ( yycstate* class_state )
 { free(class_state); }