const uint8_t* name\r
)\r
{ struct ir_class_t* iter;\r
+ printf("Class %s, addchild %s\n", class->name, name);\r
if (class->nextchild == NULL)\r
- return class->nextchild = struct_alloc(ir_class_t);\r
+ goto alloc;\r
iter = class->nextchild;\r
+ if (iter->name == NULL)\r
+ eprintf("Null name pointer in class %p\n", iter);\r
+ if (name == NULL)\r
+ eprintf("Null child added to class %s\n", iter->name);\r
check:\r
if (bytes_identical(iter->name, name))\r
return iter;\r
{ iter = iter->nextsib;\r
goto check;\r
}\r
+ alloc:\r
iter = struct_alloc(ir_class_t);\r
iter->nextsib = class->nextchild;\r
iter->name = name_alloc(name);\r
const uint8_t* name\r
)\r
{ struct ir_set_t* iter;\r
+ printf("Class %s, addset %s\n", class->name, name);\r
if (class->root_set == NULL)\r
- return class->root_set = struct_alloc(ir_set_t);\r
+ goto alloc;\r
iter = class->root_set;\r
+ if (iter->name == NULL)\r
+ eprintf("Null name pointer in class %p\n", iter);\r
+ if (name == NULL)\r
+ eprintf("Null set added to class %s\n", iter->name);\r
check:\r
if (bytes_identical(iter->name, name))\r
return iter;\r
{ iter = iter->nextsib;\r
goto check;\r
}\r
+ alloc:\r
iter = struct_alloc(ir_set_t);\r
iter->nextsib = class->root_set;\r
iter->name = name_alloc(name);\r
const uint8_t* name\r
)\r
{ struct ir_set_t* iter;\r
+ printf("Set %s, addchild %s\n", set->name, name);\r
if (set->nextchild == NULL)\r
- return set->nextchild = struct_alloc(ir_set_t);\r
+ goto alloc;\r
iter = set->nextchild;\r
+ if (iter->name == NULL)\r
+ eprintf("Null name pointer in set %p\n", iter);\r
+ if (name == NULL)\r
+ eprintf("Null child added to set %s\n", iter->name);\r
check:\r
if (bytes_identical(iter->name, name))\r
return iter;\r
{ iter = iter->nextsib;\r
goto check;\r
}\r
+ alloc:\r
iter = struct_alloc(ir_set_t);\r
iter->nextsib = set->nextchild;\r
iter->name = name_alloc(name);\r
)\r
{ struct ir_framebox_t* iter;\r
if (set->frameboxes == NULL)\r
- return set->frameboxes = struct_alloc(ir_framebox_t);\r
+ goto alloc;\r
iter = set->frameboxes;\r
check:\r
if (bytes_identical(iter->header.data_name, name))\r
{ iter = (struct ir_framebox_t*) iter->header.nextsib;\r
goto check;\r
}\r
+ alloc:\r
iter = struct_alloc(ir_framebox_t);\r
iter->header.nextsib = (union ir_setdata_t*) set->frameboxes;\r
iter->header.data_name = name_alloc(name);\r
( union ir_setdata_t* setdata,\r
const uint8_t* path\r
)\r
-{ if (setdata->header.src_filename != NULL)\r
+{ if (path == NULL)\r
+ eprintf("Null path in data %s\n", setdata->header.data_name);\r
+ if (setdata->header.src_filename != NULL)\r
wprintf("Path override: %s -> %s for setdata %s\n",\r
setdata->header.src_filename, path, setdata->header.data_name);\r
setdata->header.src_filename = name_alloc(path);\r
int height\r
)\r
{ struct ir_framedata_t* framedata = struct_alloc(ir_framedata_t);\r
+ if (name == NULL)\r
+ eprint("Null name in set allocation\n");\r
framedata->header.type = type;\r
framedata->header.data_name = name_alloc(name);\r
framedata->frameinfo.facing = d;\r
union ir_setdata_t* ir_audio\r
( const uint8_t* name )\r
{ struct ir_simplex_t* audio = struct_alloc(ir_simplex_t);\r
+ if (name == NULL)\r
+ eprint("Null audio\n");\r
audio->header.type = ADAT;\r
audio->header.data_name = name_alloc(name);\r
return (union ir_setdata_t*) audio;\r
struct ir_classld_t* ir_classld_from_class\r
( struct ir_class_t* class )\r
{ struct ir_classld_t* classld;\r
+ if (class == NULL)\r
+ eprint("Null class in classld\n");\r
classld = struct_alloc(ir_classld_t);\r
classld->root_class = class;\r
return classld;\r
void lexer_pushtok(int, YYSTYPE);
/* Public */
int lexer_setdirection(uint8_t*, int);
-int lexer_lexfile(const uint8_t*);
-int lexer_lexdir(const uint8_t*);
-int lexer_lexstring(const uint8_t*, int);
+int lexer_lexfile(uint8_t*);
+int lexer_lexdir(uint8_t*);
+int lexer_lexstring(uint8_t*, int);
int lexer_setstr(uint8_t*, int);
//apc.c
extern
yypstate* apc_pstate;
extern
yycstate* apc_cstate;
-#define PUSHTOK(T,L) yypush_parse(apc_pstate, T, (YYSTYPE*)(L), apc_cstate)
-#define LEXTOK(T,L) do { \
- PUSHTOK(T,L); \
+static
+YYSTYPE lval_stack[1024], * lvalsp;
+#define PUSHTOK(T,L) yypush_parse(apc_pstate, T, (L), apc_cstate)
+#define LEXTOK(T,Y,L) do { \
+ lvalsp->Y = L; \
+ PUSHTOK(T,lvalsp); \
+ lvalsp++; \
ntok++; \
} while (0);
-#define LEXFACE(F) do { \
- lval.face = F; \
- LEXTOK(FACING, &lval.face); \
- } while (0);
+#define PUSHFACE(F) LEXTOK(FACING, face, F)
+#define PUSHREF(R) LEXTOK(REF, ref, R)
+#define PUSHLINK() LEXTOK(LINK, val, 0)
+#define PUSHNUM(N) LEXTOK(NUM, val, N)
+#define PUSHNAME(N) LEXTOK(NAME, str, N)
+#define PUSHOP(O) LEXTOK(O, val, 0)
+#define PUSHPATH(P) LEXTOK(PATH, str, P)
/* Lexstring is the main lexer for APC and is generated by ragel. It lexes file names of files
that have been scanned and pushes their types and values into the tok_stack, which yyparse
machine lexstring;
# set up yylval and tok_t to be pushed to stack
- action push_ref { te = NULL; errno = 0;
- lval.ref = strtoll((char*)ts,(char**)&te,16);
- if (errno | (te != NULL))
+ action push_ref { errno = 0;
+ lval.ref = strtoll((char*)ts,NULL,16);
+ if (errno)
{ fprintf(stderr, "Invalid hex number in file %s\n",(char*)str);
- if (te != NULL)
- { while (str++ < te)
- fputc(' ', stderr);
- fputc('^', stderr);
- }
exit(1);
}
- LEXTOK(REF, &lval.ref);
+ PUSHREF(lval.ref);
}
- action push_link { lval.val = 0;
- PUSHTOK(LINK, &lval.val); }
- action push_val { te = NULL; errno = 0;
- lval.val = strtoll((char*)ts,(char**)&te,10);
+ action push_link { PUSHLINK(); }
+ action push_val { errno = 0;
+ lval.val = strtoll((char*)ts,NULL,10);
if (errno)
{ fprintf(stderr, "strtoll could not parse %s\n", (char*)str);
exit(1);
}
- LEXTOK(NUM, &lval.val);
+ PUSHNUM(lval.val);
}
action push_name { printf("Lexer_lexstring:: action:push_name: from %s to %s\n", ts, p);
- LEXTOK(NAME, ts);
+ PUSHNAME(ts);
}
action push_map { printf("Lexer_lexstring:: action:push_map: pushing map token\n");
- LEXTOK(MAP, "~");
+ PUSHOP(MAP);
}
action set_ts { printf("Lexer_lexstring:: action:set_ts. ts = %s\n", p); ts = p; }
action push_SS { printf("Lexer_lexstring:: action:push_SS. p = %s\n",p);
- LEXTOK(SS, "SS");
+ PUSHOP(SS);
}
action push_S { printf("Lexer_lexstring:: action:push_S. p = %s\n", p);
- LEXFACE(SFACE);
+ PUSHFACE(SFACE);
}
action push_SW { printf("Lexer_lexstring:: action:push_SW. p = %s\n", p);
- LEXFACE(SWFACE);
+ PUSHFACE(SWFACE);
}
action push_W { printf("Lexer_lexstring:: action:push_W. p = %s\n", p);
- LEXFACE(WFACE);
+ PUSHFACE(WFACE);
}
action push_NW { printf("Lexer_lexstring:: action:push_NW. p = %s\n", p);
- LEXFACE(NWFACE);
+ PUSHFACE(NWFACE);
}
action push_N { printf("Lexer_lexstring:: action:push_N. p = %s\n", p);
- LEXFACE(NFACE);
+ PUSHFACE(NFACE);
}
action push_NE { printf("Lexer_lexstring:: action:push_NE. p = %s\n", p);
- LEXFACE(NEFACE);
+ PUSHFACE(NEFACE);
}
action push_E { printf("Lexer_lexstring:: action:push_N. p = %s\n", p);
- LEXFACE(EFACE);
+ PUSHFACE(EFACE);
}
action push_SE { printf("Lexer_lexstring:: action:push_N. p = %s\n", p);
- LEXFACE(SEFACE);
+ PUSHFACE(SEFACE);
}
action ref_error { printf("ref from %s to %s has an inappropriate amount of hex digits, it must have eight.\n", ts, p);
exit(1);
}%%
int lexer_lexstring
-( const uint8_t* str,
+( uint8_t* str,
int size
)
-{ const uint8_t *p;
- const uint8_t *ts, *pe, *te, *eof;
+{ uint8_t *p;
+ uint8_t *ts, *pe, *eof;
int cs, ntok;
YYSTYPE lval;
+ lvalsp = lval_stack;
ntok = 0;
p = ts = str;
pe = eof = p + size + 1;
-
printf("|---Begin lexstring on p = %s, pe = %s.\n",p, pe);
Returns the number of tokens pushed to the parser.
*/
int lexer_lexfile
-( uint8_t const* filename )
-{ uint8_t const* last_period,* iter;
+( uint8_t* filename )
+{ uint8_t* last_period,* iter,* filename_end;
int ntok;
last_period = NULL;
for (iter = filename; *iter; iter++)
- if (*iter == '.')
- last_period = iter;
+ switch (*iter)
+ { // Keep track of the last 'dot' in the name
+ case '.' : last_period = iter; continue;
+ // replace '_' with '\0' so bison can use strlen on them as tokens.
+ case '_' : *iter = '\0';
+ default: continue;
+ }
+ // Mark the end of the filename
+ filename_end = iter;
+ // Lex from either the last period, if present, or filename end
ntok = (last_period) ?
lexer_lexstring(filename, (int)(last_period - filename))
: lexer_lexstring(filename, (int)(iter - filename));
- PUSHTOK(PATH,&filename);
+ // Replace nulls with their original '_'
+ for (iter = filename; iter < filename_end; iter++)
+ if (*iter == '\0')
+ *iter = '_';
+ PUSHPATH(filename);
return ntok + 1;
return en_main == 1;
}
int lexer_lexdir
-( uint8_t const* dirname )
-{ uint8_t const* de = dirname;
- while (*de++);
- return lexer_lexstring(dirname, (int)(de - dirname));
+( uint8_t* dirname )
+{ uint8_t* de = dirname;
+ int ntok;
+ ntok = 0;
+ de = dirname;
+ if (*de) while (*++de);
+ ntok = lexer_lexstring(dirname, (int)(de - dirname));
+ PUSHOP(CLOPEN);
+ return ntok;
+}
+
+int lexer_closedir
+( void )
+{ int ntok = 0;
+ PUSHOP(CLCLOSE);
+ return ntok;
}
/**************************/
yycstate* apc_cstate;
/* Private */
extern //lexer.rl
-int lexer_lexfile(uint8_t const*);
-#define PUSHTOK(T,L) yypush_parse(apc_pstate, T, L, apc_cstate)
+int lexer_lexfile(uint8_t*);
+extern //lexer.rl
+int lexer_lexdir(uint8_t*);
+extern //lexer.rl
+void lexer_closedir(void);
/* Init
Establishes yy states
lexer_lexfile((uint8_t*)direntp->d_name);
goto scan_next_dirent;
case DT_DIR:
- lexer_lexfile((uint8_t*)direntp->d_name); //lex the dirname
+ lexer_lexdir((uint8_t*)direntp->d_name); //lex the dirname
printf("lexdir %s\n",direntp->d_name);
if (chdir(direntp->d_name)) //change to the specified dir
goto libfail;
errno = 0;
if ((cdirp = opendir(".")) == NULL || errno) //open it
goto libfail;
- PUSHTOK(CLOPEN, NULL); //push "Open Directory" token
printf("Scanner entered [%s]\n",direntp->d_name);
if(scanner_scandir(cdirp)) //scan the directory
goto libfail;
if (chdir("..")) //return to the parent dir
goto libfail;
- PUSHTOK(CLCLOSE, NULL); //push "Close Directory" token
+ lexer_closedir(); //push "Close Directory" token
printf("Scanner returned\n");
goto scan_next_dirent; //continue scan
case DT_UNKNOWN:
projects / henge / apc.git / commitdiff