diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2014-03-26 13:59:14 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2014-03-26 13:59:14 -0700 |
| commit | f2a437bd3bff39fc40e9fc0868cb22d47cc84614 (patch) | |
| tree | 4c43ea5be7814b6c1fa65be9c75e8e8548212d2b /parse_constants.h | |
| parent | 12025e30503f68ffbd4dac0d318e253c71c97bca (diff) | |
| parent | 7a7fb423b306d3de62ef62ff4c8cbded2cdd0f10 (diff) | |
Merge branch 'master' into parser_cleanup
Conflicts:
parse_constants.h
parse_tree.h
Diffstat (limited to 'parse_constants.h')
| -rw-r--r-- | parse_constants.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/parse_constants.h b/parse_constants.h index d464e396..31f07f60 100644 --- a/parse_constants.h +++ b/parse_constants.h @@ -6,10 +6,11 @@ #ifndef fish_parse_constants_h #define fish_parse_constants_h +#include "config.h" + #define PARSE_ASSERT(a) assert(a) #define PARSER_DIE() do { fprintf(stderr, "Parser dying!\n"); exit_without_destructors(-1); } while (0) - enum parse_token_type_t { token_type_invalid, @@ -70,7 +71,7 @@ enum parse_token_type_t LAST_TOKEN_OR_SYMBOL = parse_token_type_terminate, FIRST_PARSE_TOKEN_TYPE = parse_token_type_string -}; +} __packed; enum parse_keyword_t { @@ -93,7 +94,7 @@ enum parse_keyword_t parse_keyword_exec, LAST_KEYWORD = parse_keyword_exec -}; +} __packed; /* Statement decorations. This matches the order of productions in decorated_statement */ enum parse_statement_decoration_t |