%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);
#include <dirent.h>
#include <unitypes.h>
#include "ir.h"
-
+
struct class_state_t {
ir_class *csp;
ir_class class_stack[];
#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
%union {
long long ref;
int val;
- ir_facing face;
+ apc_facing face;
uint8_t* str;
ir_class class;
ir_set set;
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:
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}; }
;
%%
( yycstate* cs,
char const *s
)
-{ fprintf(stderr, "%s\n", 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 )
{ 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 )