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

Remove ItemSet class; just use a set

Browse source
This commit is contained in:
Max Brunsfeld 2014-01-13 18:47:57 -08:00
parent 29f73afbc5
commit d015d57a53
11 changed files with 93 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

118
spec/fixtures/parsers/arithmetic.c vendored
View file

@ -57,17 +57,17 @@ static void ts_lex(TSParser *parser) {
case 6:
ACCEPT_TOKEN(ts_symbol_4);
case 7:
if (LOOKAHEAD_CHAR() == '*')
ADVANCE(8);
LEX_ERROR(1, EXPECT({"'*'"}));
case 8:
ACCEPT_TOKEN(ts_symbol_3);
case 9:
if (LOOKAHEAD_CHAR() == ')')
ADVANCE(10);
ADVANCE(8);
LEX_ERROR(1, EXPECT({"')'"}));
case 10:
case 8:
ACCEPT_TOKEN(ts_symbol_2);
case 9:
if (LOOKAHEAD_CHAR() == '*')
ADVANCE(10);
LEX_ERROR(1, EXPECT({"'*'"}));
case 10:
ACCEPT_TOKEN(ts_symbol_3);
default:
LEX_PANIC();
}
@ -80,20 +80,20 @@ static TSParseResult ts_parse(const char *input) {
case 0:
SET_LEX_STATE(0);
switch (LOOKAHEAD_SYM()) {
case ts_symbol_variable:
SHIFT(8);
case ts_symbol_factor:
SHIFT(5);
case ts_symbol_number:
SHIFT(8);
case ts_symbol_1:
SHIFT(9);
case ts_symbol_variable:
SHIFT(5);
case ts_symbol_term:
SHIFT(2);
case ts_symbol_1:
SHIFT(6);
case ts_symbol_number:
SHIFT(5);
case ts_symbol_expression:
SHIFT(1);
default:
PARSE_ERROR(6, EXPECT({"expression", "term", "1", "number", "factor", "variable"}));
PARSE_ERROR(6, EXPECT({"expression", "number", "1", "term", "variable", "factor"}));
}
case 1:
SET_LEX_STATE(4);
@ -114,18 +114,18 @@ static TSParseResult ts_parse(const char *input) {
case 3:
SET_LEX_STATE(0);
switch (LOOKAHEAD_SYM()) {
case ts_symbol_variable:
SHIFT(8);
case ts_symbol_factor:
SHIFT(9);
case ts_symbol_variable:
SHIFT(5);
case ts_symbol_1:
SHIFT(9);
SHIFT(6);
case ts_symbol_number:
SHIFT(8);
SHIFT(5);
case ts_symbol_term:
SHIFT(4);
default:
PARSE_ERROR(5, EXPECT({"term", "number", "1", "factor", "variable"}));
PARSE_ERROR(5, EXPECT({"term", "number", "1", "variable", "factor"}));
}
case 4:
SET_LEX_STATE(4);
@ -134,70 +134,64 @@ static TSParseResult ts_parse(const char *input) {
REDUCE(ts_symbol_expression, 3);
}
case 5:
SET_LEX_STATE(7);
switch (LOOKAHEAD_SYM()) {
case ts_symbol_3:
SHIFT(6);
default:
REDUCE(ts_symbol_term, 1);
}
case 6:
SET_LEX_STATE(0);
switch (LOOKAHEAD_SYM()) {
case ts_symbol_1:
SHIFT(9);
case ts_symbol_number:
SHIFT(8);
case ts_symbol_variable:
SHIFT(8);
case ts_symbol_factor:
SHIFT(7);
default:
PARSE_ERROR(4, EXPECT({"factor", "variable", "number", "1"}));
}
case 7:
SET_LEX_STATE(4);
switch (LOOKAHEAD_SYM()) {
default:
REDUCE(ts_symbol_term, 3);
}
case 8:
SET_LEX_STATE(4);
switch (LOOKAHEAD_SYM()) {
default:
REDUCE(ts_symbol_factor, 1);
}
case 9:
case 6:
SET_LEX_STATE(0);
switch (LOOKAHEAD_SYM()) {
case ts_symbol_variable:
SHIFT(8);
case ts_symbol_factor:
SHIFT(5);
case ts_symbol_number:
SHIFT(8);
case ts_symbol_1:
SHIFT(9);
case ts_symbol_expression:
SHIFT(7);
case ts_symbol_term:
SHIFT(2);
case ts_symbol_expression:
SHIFT(10);
default:
PARSE_ERROR(6, EXPECT({"expression", "term", "1", "number", "factor", "variable"}));
PARSE_ERROR(3, EXPECT({"term", "expression", "factor"}));
}
case 10:
SET_LEX_STATE(9);
case 7:
SET_LEX_STATE(7);
switch (LOOKAHEAD_SYM()) {
case ts_symbol_2:
SHIFT(11);
SHIFT(8);
default:
PARSE_ERROR(1, EXPECT({"2"}));
}
case 8:
SET_LEX_STATE(4);
switch (LOOKAHEAD_SYM()) {
default:
REDUCE(ts_symbol_factor, 3);
}
case 9:
SET_LEX_STATE(9);
switch (LOOKAHEAD_SYM()) {
case ts_symbol_3:
SHIFT(10);
default:
REDUCE(ts_symbol_term, 1);
}
case 10:
SET_LEX_STATE(0);
switch (LOOKAHEAD_SYM()) {
case ts_symbol_factor:
SHIFT(11);
case ts_symbol_1:
SHIFT(6);
case ts_symbol_number:
SHIFT(5);
case ts_symbol_variable:
SHIFT(5);
default:
PARSE_ERROR(4, EXPECT({"variable", "number", "1", "factor"}));
}
case 11:
SET_LEX_STATE(4);
switch (LOOKAHEAD_SYM()) {
default:
REDUCE(ts_symbol_factor, 3);
REDUCE(ts_symbol_term, 3);
}
default:
PARSE_PANIC();

4
src/compiler/build_tables/item.cpp
View file

@ -33,6 +33,10 @@ namespace tree_sitter {
return rule_names_eq && rules_eq && consumed_sym_counts_eq;
}
bool Item::operator<(const Item &other) const {
return rule_name < other.rule_name;
}
bool Item::is_done() const {
for (auto pair : rule_transitions(rule))
if (*pair.first == rules::Blank())

17
src/compiler/build_tables/item.h
View file

@ -4,6 +4,7 @@
#include <string>
#include "rule.h"
#include <set>
#include <unordered_set>
namespace tree_sitter {
class Grammar;
@ -18,6 +19,7 @@ namespace tree_sitter {
static Item at_beginning_of_token(const std::string &rule_name, const Grammar &grammar);
bool operator==(const Item &other) const;
bool operator<(const Item &other) const;
bool is_done() const;
int next_sym_count() const;
@ -26,6 +28,8 @@ namespace tree_sitter {
const int consumed_sym_count;
};
typedef std::set<Item> ItemSet;
std::ostream& operator<<(std::ostream &stream, const Item &item);
}
}
@ -33,13 +37,24 @@ namespace tree_sitter {
namespace std {
template<>
struct hash<tree_sitter::build_tables::Item> {
size_t operator()(const tree_sitter::build_tables::Item &item) {
size_t operator()(const tree_sitter::build_tables::Item &item) const {
return
hash<std::string>()(item.rule_name) ^
hash<tree_sitter::rules::Rule>()(*item.rule) ^
hash<int>()(item.consumed_sym_count);
}
};
template<>
struct hash<const tree_sitter::build_tables::ItemSet> {
size_t operator()(const tree_sitter::build_tables::ItemSet &item_set) const {
size_t result = hash<size_t>()(item_set.size());
for (auto item : item_set)
result ^= hash<tree_sitter::build_tables::Item>()(item);
return result;
}
};
}
#endif

34
src/compiler/build_tables/item_set.cpp
View file

@ -1,34 +0,0 @@
#include "item_set.h"
using std::vector;
using std::ostream;
using std::string;
namespace tree_sitter {
namespace build_tables {
ItemSet::ItemSet(const vector<Item> &items) : contents(items) {}
bool ItemSet::operator==(const tree_sitter::build_tables::ItemSet &other) const {
return contents == other.contents;
}
ItemSet::const_iterator ItemSet::begin() const {
return contents.begin();
}
ItemSet::const_iterator ItemSet::end() const {
return contents.end();
}
size_t ItemSet::size() const {
return contents.size();
}
ostream& operator<<(ostream &stream, const ItemSet &item_set) {
stream << string("#<item_set ");
for (Item item : item_set)
stream << item << string(" ");
return stream << string(">");
}
}
}

42
src/compiler/build_tables/item_set.h
View file

@ -1,42 +0,0 @@
#ifndef __TreeSitter__item_set__
#define __TreeSitter__item_set__
#include "item.h"
#include "rule.h"
#include <vector>
#include <set>
namespace tree_sitter {
namespace build_tables {
class ItemSet;
class ItemSet {
const std::vector<Item> contents;
public:
ItemSet(const std::vector<Item> &items);
bool operator==(const ItemSet &other) const;
typedef Item value_type;
typedef std::vector<Item>::const_iterator const_iterator;
const_iterator begin() const;
const_iterator end() const;
size_t size() const;
};
std::ostream& operator<<(std::ostream &stream, const ItemSet &item_set);
}
}
namespace std {
template<>
struct hash<const tree_sitter::build_tables::ItemSet> {
size_t operator()(const tree_sitter::build_tables::ItemSet &item_set) const {
size_t result = hash<size_t>()(item_set.size());
for (auto item : item_set)
result ^= hash<tree_sitter::build_tables::Item>()(item);
return result;
}
};
}
#endif

18
src/compiler/build_tables/item_set_closure.cpp
View file

@ -8,25 +8,25 @@ using std::vector;
namespace tree_sitter {
namespace build_tables {
static bool vector_contains(vector<Item> items, build_tables::Item item) {
static bool contains(ItemSet items, Item item) {
return (std::find(items.begin(), items.end(), item) != items.end());
}
static void add_item(vector<Item> &vector, const Item &item, const Grammar &grammar) {
if (!vector_contains(vector, item)) {
vector.push_back(item);
static void add_item(ItemSet &item_set, const Item &item, const Grammar &grammar) {
if (!contains(item_set, item)) {
item_set.insert(item);
for (rules::Symbol rule : next_non_terminals(item, grammar)) {
Item next_item = Item::at_beginning_of_rule(rule.name, grammar);
add_item(vector, next_item, grammar);
add_item(item_set, next_item, grammar);
}
}
}
ItemSet item_set_closure(const ItemSet &item_set, const Grammar &grammar) {
vector<Item> items;
const ItemSet item_set_closure(const ItemSet &item_set, const Grammar &grammar) {
ItemSet result;
for (Item item : item_set)
add_item(items, item, grammar);
return ItemSet(items);
add_item(result, item, grammar);
return result;
}
}
}

4
src/compiler/build_tables/item_set_closure.h
View file

@ -1,13 +1,13 @@
#ifndef __tree_sitter__close_item_set__
#define __tree_sitter__close_item_set__
#include "item_set.h"
#include "item.h"
namespace tree_sitter {
class Grammar;
namespace build_tables {
ItemSet item_set_closure(const ItemSet &item_set, const Grammar &grammar);
const ItemSet item_set_closure(const ItemSet &item_set, const Grammar &grammar);
}
}

2
src/compiler/build_tables/item_set_transitions.h
View file

@ -4,7 +4,7 @@
#include "character.h"
#include "symbol.h"
#include "transition_map.h"
#include "item_set.h"
#include "item.h"
namespace tree_sitter {
namespace build_tables {

2
src/compiler/build_tables/next_symbols.h
View file

@ -1,7 +1,7 @@
#ifndef __tree_sitter__first_terminal__
#define __tree_sitter__first_terminal__
#include "item_set.h"
#include "item.h"
#include "symbol.h"
#include <set>

8
src/compiler/build_tables/perform.cpp
View file

@ -1,5 +1,5 @@
#include "./perform.h"
#include "item_set.h"
#include "item.h"
#include "item_set_closure.h"
#include "next_symbols.h"
#include "item_set_transitions.h"
@ -83,10 +83,10 @@ namespace tree_sitter {
}
ItemSet lex_item_set_for_parse_item_set(const ItemSet &parse_item_set) {
vector<Item> items;
ItemSet result;
for (rules::Symbol symbol : next_terminals(parse_item_set, grammar))
items.push_back(Item::at_beginning_of_token(symbol.name, lex_grammar));
return ItemSet(items);
result.insert(Item::at_beginning_of_token(symbol.name, lex_grammar));
return result;
}
size_t add_parse_state(const ItemSet &item_set) {

6
tree_sitter.xcodeproj/project.pbxproj
View file

@ -27,7 +27,6 @@
12EDCF9A1881FCD9005A7A07 /* search_for_symbols.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12EDCF931881FCCA005A7A07 /* search_for_symbols.cpp */; };
12EDCFAF18820387005A7A07 /* parse_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12EDCF9D18820116005A7A07 /* parse_table.cpp */; };
12EDCFB018820392005A7A07 /* item.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12EDCFA218820137005A7A07 /* item.cpp */; };
12EDCFB118820395005A7A07 /* item_set.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12EDCFA018820137005A7A07 /* item_set.cpp */; };
12EDCFB21882039A005A7A07 /* perform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12EDCFA418820137005A7A07 /* perform.cpp */; };
12EDCFB31882039A005A7A07 /* rule_transitions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12EDCFA618820137005A7A07 /* rule_transitions.cpp */; };
12EDCFB418820519005A7A07 /* compile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12EDCFAC18820181005A7A07 /* compile.cpp */; };
@ -117,8 +116,6 @@
12EDCF9C18820116005A7A07 /* lex_table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lex_table.h; sourceTree = "<group>"; };
12EDCF9D18820116005A7A07 /* parse_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parse_table.cpp; sourceTree = "<group>"; };
12EDCF9E18820116005A7A07 /* parse_table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parse_table.h; sourceTree = "<group>"; };
12EDCFA018820137005A7A07 /* item_set.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = item_set.cpp; path = src/compiler/build_tables/item_set.cpp; sourceTree = SOURCE_ROOT; };
12EDCFA118820137005A7A07 /* item_set.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = item_set.h; path = src/compiler/build_tables/item_set.h; sourceTree = SOURCE_ROOT; };
12EDCFA218820137005A7A07 /* item.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = item.cpp; path = src/compiler/build_tables/item.cpp; sourceTree = SOURCE_ROOT; };
12EDCFA318820137005A7A07 /* item.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = item.h; path = src/compiler/build_tables/item.h; sourceTree = SOURCE_ROOT; };
12EDCFA418820137005A7A07 /* perform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = perform.cpp; path = src/compiler/build_tables/perform.cpp; sourceTree = SOURCE_ROOT; };
@ -209,8 +206,6 @@
children = (
12EDCFA218820137005A7A07 /* item.cpp */,
12EDCFA318820137005A7A07 /* item.h */,
12EDCFA018820137005A7A07 /* item_set.cpp */,
12EDCFA118820137005A7A07 /* item_set.h */,
12EDCFBE18820880005A7A07 /* item_set_closure.cpp */,
12EDCFBF18820880005A7A07 /* item_set_closure.h */,
12EDCFC118820A70005A7A07 /* item_set_transitions.cpp */,
@ -502,7 +497,6 @@
12EDCFB418820519005A7A07 /* compile.cpp in Sources */,
12BC470718830BC5005AC502 /* next_symbols_spec.cpp in Sources */,
1213060B182C389100FCF928 /* symbol.cpp in Sources */,
12EDCFB118820395005A7A07 /* item_set.cpp in Sources */,
1251209B1830145300C9B56A /* rule.cpp in Sources */,
27A343CA69E17E0F9EBEDF1C /* pattern.cpp in Sources */,
);