traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ParseStateId / size_t confusion in parse table

Browse source
This commit is contained in:
Max Brunsfeld 2014-07-07 13:21:30 -07:00
parent c5c25d30bb
commit f4287c07d0
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/compiler/parse_table.h
View file

@ -9,6 +9,8 @@
#include "compiler/rules/symbol.h"
namespace tree_sitter {
typedef uint64_t ParseStateId;
typedef enum {
ParseActionTypeError,
ParseActionTypeShift,
@ -20,7 +22,7 @@ namespace tree_sitter {
class ParseAction {
ParseAction(ParseActionType type,
size_t state_index,
ParseStateId state_index,
rules::Symbol symbol,
size_t consumed_symbol_count,
std::set<int> precedence_values);
@ -28,7 +30,7 @@ namespace tree_sitter {
ParseAction();
static ParseAction Accept();
static ParseAction Error();
static ParseAction Shift(size_t state_index, std::set<int> precedence_values);
static ParseAction Shift(ParseStateId state_index, std::set<int> precedence_values);
static ParseAction Reduce(rules::Symbol symbol, size_t consumed_symbol_count, int precedence);
static ParseAction ShiftExtra();
static ParseAction ReduceExtra(rules::Symbol symbol);
@ -36,7 +38,7 @@ namespace tree_sitter {
ParseActionType type;
rules::Symbol symbol;
size_t state_index;
ParseStateId state_index;
size_t consumed_symbol_count;
std::set<int> precedence_values;
};
@ -66,13 +68,11 @@ namespace tree_sitter {
LexStateId lex_state_id;
};
typedef uint64_t ParseStateId;
std::ostream& operator<<(std::ostream &stream, const ParseState &state);
class ParseTable {
public:
uint64_t add_state();
ParseStateId add_state();
void add_action(ParseStateId state_id, rules::Symbol symbol, ParseAction action);
std::vector<ParseState> states;