emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

let's just use ((void *)-1) as another invalid pointer result

Browse source
This commit is contained in:
Sven M. Hallberg 2015-09-05 22:43:49 +02:00
parent 90b6f30fa1
commit 8995097a1d
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/backends/llk.c
View file

@ -276,8 +276,7 @@ typedef struct {
// execute on their corresponding result. // execute on their corresponding result.
// also on the stack below the mark, we store the previously accumulated // also on the stack below the mark, we store the previously accumulated
// value for the surrounding production. // value for the surrounding production.
static int dummy; static void *MARK = (void *)-1; // stack frame delimiter
static void *MARK = &dummy; // stack frame delimiter
static HLLkState *llk_parse_start_(HAllocator* mm__, const HParser* parser) static HLLkState *llk_parse_start_(HAllocator* mm__, const HParser* parser)
{ {
@ -329,7 +328,7 @@ static HCountedArray *llk_parse_chunk_(HLLkState *s, const HParser* parser,
const HCFSequence *p = h_llk_lookup(table, x, stream); const HCFSequence *p = h_llk_lookup(table, x, stream);
if(p == NULL) if(p == NULL)
goto no_parse; goto no_parse;
if(p == H_NEED_INPUT) if(p == NEED_INPUT)
goto need_input; goto need_input;
// an infinite loop case that shouldn't happen // an infinite loop case that shouldn't happen

4
src/cfgrammar.c
View file

@ -349,7 +349,7 @@ void *h_stringmap_get(const HStringMap *m, const uint8_t *str, size_t n, bool en
return m->epsilon_branch; return m->epsilon_branch;
} }
// A NULL result means no parse. H_NEED_INPUT means lookahead is too short. // A NULL result means no parse. NEED_INPUT means lookahead is too short.
void *h_stringmap_get_lookahead(const HStringMap *m, HInputStream lookahead) void *h_stringmap_get_lookahead(const HStringMap *m, HInputStream lookahead)
{ {
while(m) { while(m) {
@ -368,7 +368,7 @@ void *h_stringmap_get_lookahead(const HStringMap *m, HInputStream lookahead)
// XXX assumption of byte-wise grammar and input // XXX assumption of byte-wise grammar and input
return m->end_branch; return m->end_branch;
} else { } else {
return H_NEED_INPUT; return NEED_INPUT;
} }
} }

2
src/cfgrammar.h
View file

@ -57,7 +57,7 @@ static inline HStringMap *h_stringmap_get_char(const HStringMap *m, const uint8_
{ return h_hashtable_get(m->char_branches, (void *)char_key(c)); } { return h_hashtable_get(m->char_branches, (void *)char_key(c)); }
// dummy return value used by h_stringmap_get_lookahead when out of input // dummy return value used by h_stringmap_get_lookahead when out of input
#define H_NEED_INPUT ((void *)&h_stringmap_get_lookahead) #define NEED_INPUT ((void *)-1)
/* Convert 'parser' into CFG representation by desugaring and compiling the set /* Convert 'parser' into CFG representation by desugaring and compiling the set