Remove all non const reference parameters

This commit is contained in:
Max Brunsfeld 2014-03-09 22:21:58 -07:00
parent a411e43484
commit 661314cf4e
20 changed files with 37 additions and 37 deletions

View file

@ -10,13 +10,13 @@ namespace tree_sitter {
using rules::Symbol;
namespace build_tables {
static bool contains(const ParseItemSet &items, const ParseItem &item) {
return items.size() > 0 && (std::find(items.begin(), items.end(), item) != items.end());
static bool contains(const ParseItemSet *items, const ParseItem &item) {
return items->size() > 0 && (std::find(items->begin(), items->end(), item) != items->end());
}
static void add_item(ParseItemSet &item_set, const ParseItem &item, const PreparedGrammar &grammar) {
static void add_item(ParseItemSet *item_set, const ParseItem &item, const PreparedGrammar &grammar) {
if (!contains(item_set, item)) {
item_set.insert(item);
item_set->insert(item);
for (auto &pair : follow_sets(item, grammar)) {
Symbol non_terminal = pair.first;
set<Symbol> terminals = pair.second;
@ -31,7 +31,7 @@ namespace tree_sitter {
const ParseItemSet item_set_closure(const ParseItemSet &item_set, const PreparedGrammar &grammar) {
ParseItemSet result;
for (ParseItem item : item_set)
add_item(result, item, grammar);
add_item(&result, item, grammar);
return result;
}
}

View file

@ -2,13 +2,13 @@
namespace tree_sitter {
namespace generate_code {
static void str_replace(string &input, const string &search, const string &replace) {
static void str_replace(string *input, const string &search, const string &replace) {
size_t pos = 0;
while (1) {
pos = input.find(search, pos);
pos = input->find(search, pos);
if (pos == string::npos) break;
input.erase(pos, search.length());
input.insert(pos, replace);
input->erase(pos, search.length());
input->insert(pos, replace);
pos += replace.length();
}
}
@ -30,12 +30,12 @@ namespace tree_sitter {
string indent(string input) {
string tab = " ";
str_replace(input, "\n", "\n" + tab);
str_replace(&input, "\n", "\n" + tab);
return tab + input;
}
string escape_string(string input) {
str_replace(input, "\"", "\\\"");
str_replace(&input, "\"", "\\\"");
return input;
}
}

View file

@ -21,8 +21,8 @@ namespace tree_sitter {
return "#<blank>";
}
void Blank::accept(Visitor &visitor) const {
visitor.visit(this);
void Blank::accept(Visitor *visitor) const {
visitor->visit(this);
}
}
}

View file

@ -13,7 +13,7 @@ namespace tree_sitter {
size_t hash_code() const;
rule_ptr copy() const;
std::string to_string() const;
void accept(Visitor &visitor) const;
void accept(Visitor *visitor) const;
};
}
}

View file

@ -151,8 +151,8 @@ namespace tree_sitter {
return copy.remove_set(set);
}
void CharacterSet::accept(Visitor &visitor) const {
visitor.visit(this);
void CharacterSet::accept(Visitor *visitor) const {
visitor->visit(this);
}
}
}

View file

@ -19,7 +19,7 @@ namespace tree_sitter {
size_t hash_code() const;
rule_ptr copy() const;
std::string to_string() const;
void accept(Visitor &visitor) const;
void accept(Visitor *visitor) const;
void add_set(const CharacterSet &other);
CharacterSet remove_set(const CharacterSet &other);

View file

@ -33,8 +33,8 @@ namespace tree_sitter {
return string("#<choice ") + left->to_string() + " " + right->to_string() + ">";
}
void Choice::accept(Visitor &visitor) const {
visitor.visit(this);
void Choice::accept(Visitor *visitor) const {
visitor->visit(this);
}
}
}

View file

@ -15,7 +15,7 @@ namespace tree_sitter {
size_t hash_code() const;
rule_ptr copy() const;
std::string to_string() const;
void accept(Visitor &visitor) const;
void accept(Visitor *visitor) const;
const rule_ptr left;
const rule_ptr right;

View file

@ -170,8 +170,8 @@ namespace tree_sitter {
return string("#<pattern '") + value + "'>";
}
void Pattern::accept(Visitor &visitor) const {
visitor.visit(this);
void Pattern::accept(Visitor *visitor) const {
visitor->visit(this);
}
rule_ptr Pattern::to_rule_tree() const {

View file

@ -14,7 +14,7 @@ namespace tree_sitter {
size_t hash_code() const;
rule_ptr copy() const;
std::string to_string() const;
void accept(Visitor &visitor) const;
void accept(Visitor *visitor) const;
rule_ptr to_rule_tree() const;
};

View file

@ -24,8 +24,8 @@ namespace tree_sitter {
return string("#<repeat ") + content->to_string() + ">";
}
void Repeat::accept(Visitor &visitor) const {
visitor.visit(this);
void Repeat::accept(Visitor *visitor) const {
visitor->visit(this);
}
}
}

View file

@ -13,7 +13,7 @@ namespace tree_sitter {
size_t hash_code() const;
rule_ptr copy() const;
std::string to_string() const;
void accept(Visitor &visitor) const;
void accept(Visitor *visitor) const;
const rule_ptr content;
};

View file

@ -18,7 +18,7 @@ namespace tree_sitter {
virtual size_t hash_code() const = 0;
virtual rule_ptr copy() const = 0;
virtual std::string to_string() const = 0;
virtual void accept(Visitor &visitor) const = 0;
virtual void accept(Visitor *visitor) const = 0;
};
std::ostream& operator<<(std::ostream& stream, const Rule &rule);

View file

@ -34,8 +34,8 @@ namespace tree_sitter {
return string("#<seq ") + left->to_string() + " " + right->to_string() + ">";
}
void Seq::accept(Visitor &visitor) const {
visitor.visit(this);
void Seq::accept(Visitor *visitor) const {
visitor->visit(this);
}
}
}

View file

@ -15,7 +15,7 @@ namespace tree_sitter {
size_t hash_code() const;
rule_ptr copy() const;
std::string to_string() const;
void accept(Visitor &visitor) const;
void accept(Visitor *visitor) const;
const rule_ptr left;
const rule_ptr right;

View file

@ -25,8 +25,8 @@ namespace tree_sitter {
return string("#<string '") + value + "'>";
}
void String::accept(Visitor &visitor) const {
visitor.visit(this);
void String::accept(Visitor *visitor) const {
visitor->visit(this);
}
}
}

View file

@ -13,7 +13,7 @@ namespace tree_sitter {
size_t hash_code() const;
rule_ptr copy() const;
std::string to_string() const;
void accept(Visitor &visitor) const;
void accept(Visitor *visitor) const;
const std::string value;
};

View file

@ -58,8 +58,8 @@ namespace tree_sitter {
return (type == SymbolTypeHidden || type == SymbolTypeAuxiliary);
}
void Symbol::accept(Visitor &visitor) const {
visitor.visit(this);
void Symbol::accept(Visitor *visitor) const {
visitor->visit(this);
}
}
}

View file

@ -24,7 +24,7 @@ namespace tree_sitter {
size_t hash_code() const;
rule_ptr copy() const;
std::string to_string() const;
void accept(Visitor &visitor) const;
void accept(Visitor *visitor) const;
bool operator<(const Symbol &other) const;
bool is_built_in() const;

View file

@ -34,7 +34,7 @@ namespace tree_sitter {
public:
T apply(const rule_ptr &rule) {
value = T();
rule->accept(*this);
rule->accept(this);
return value;
}
};