h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-05 00:01:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into parser_cleanup

Browse Source 
Conflicts:
	parse_constants.h
	parse_tree.h
This commit is contained in:
ridiculousfish
2014-03-26 13:59:14 -07:00
parent 12025e3050 7a7fb423b3
commit f2a437bd3b
16 changed files with 954 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
parse_constants.h
View File

@@ -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