Tweak auto-format settings

Prefer lines that exceed 80 characters by a small margin to
line breaks in argument lists
This commit is contained in:
Max Brunsfeld 2014-09-09 13:15:40 -07:00
parent e9dad529f5
commit 2e7ffb4d14
19 changed files with 42 additions and 61 deletions

View file

@ -32,18 +32,17 @@ std::ostream &operator<<(std::ostream &stream, const rules::rule_ptr &rule);
} // namespace rules
class Grammar {
const std::vector<std::pair<std::string, rules::rule_ptr> > rules_;
const std::vector<std::pair<std::string, rules::rule_ptr>> rules_;
std::set<rules::rule_ptr> ubiquitous_tokens_;
public:
Grammar(const std::vector<std::pair<std::string, rules::rule_ptr> > &rules);
bool operator==(const Grammar &other) const;
explicit Grammar(const std::vector<std::pair<std::string, rules::rule_ptr>> &);
bool operator==(const Grammar &) const;
std::string start_rule_name() const;
const rules::rule_ptr rule(const std::string &name) const;
const std::vector<std::pair<std::string, rules::rule_ptr> > &rules() const;
const rules::rule_ptr rule(const std::string &) const;
const std::vector<std::pair<std::string, rules::rule_ptr>> &rules() const;
const std::set<rules::rule_ptr> &ubiquitous_tokens() const;
Grammar &ubiquitous_tokens(
const std::set<rules::rule_ptr> &ubiquitous_tokens);
Grammar &ubiquitous_tokens(const std::set<rules::rule_ptr> &);
};
struct Conflict {

View file

@ -138,16 +138,15 @@ struct TSLanguage {
#define ACCEPT_INPUT() \
{ .type = TSParseActionTypeAccept }
#define EXPORT_LANGUAGE(language_name) \
static TSLanguage language = { \
.symbol_count = SYMBOL_COUNT, \
.hidden_symbol_flags = ts_hidden_symbol_flags, \
.parse_table = (const TSParseAction *)ts_parse_actions, \
.lex_states = ts_lex_states, \
.symbol_names = ts_symbol_names, \
.lex_fn = ts_lex, \
}; \
\
#define EXPORT_LANGUAGE(language_name) \
static TSLanguage language = { .symbol_count = SYMBOL_COUNT, \
.hidden_symbol_flags = ts_hidden_symbol_flags, \
.parse_table = \
(const TSParseAction *)ts_parse_actions, \
.lex_states = ts_lex_states, \
.symbol_names = ts_symbol_names, \
.lex_fn = ts_lex, }; \
\
const TSLanguage *language_name() { return &language; }
#ifdef __cplusplus