ISymbol -> Symbol

Interned symbols are now the main type of symbol in use
This commit is contained in:
Max Brunsfeld 2014-04-28 20:43:27 -07:00
parent faf80aadac
commit 25eda9d889
45 changed files with 248 additions and 250 deletions

View file

@ -84,11 +84,11 @@ namespace tree_sitter {
private:
const PreparedGrammar & grammar_for_symbol(const rules::ISymbol &symbol) {
const PreparedGrammar & grammar_for_symbol(const rules::Symbol &symbol) {
return symbol.is_token() ? lexical_grammar : syntax_grammar;
}
string symbol_id(const rules::ISymbol &symbol) {
string symbol_id(const rules::Symbol &symbol) {
if (symbol.is_built_in()) {
return (symbol == rules::ERROR()) ?
"ts_builtin_sym_error" :
@ -102,7 +102,7 @@ namespace tree_sitter {
}
}
string symbol_name(const rules::ISymbol &symbol) {
string symbol_name(const rules::Symbol &symbol) {
if (symbol.is_built_in()) {
return (symbol == rules::ERROR()) ? "error" : "end";
} else if (symbol.is_token() && symbol.is_auxiliary()) {
@ -211,7 +211,7 @@ namespace tree_sitter {
}
string symbol_names_list() {
set<rules::ISymbol> symbols(parse_table.symbols);
set<rules::Symbol> symbols(parse_table.symbols);
symbols.insert(rules::END_OF_INPUT());
symbols.insert(rules::ERROR());