neocturne/solar
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

parse: improve code formatting

Browse source
This commit is contained in:
Matthias Schiffer 2015-04-18 18:54:40 +02:00
parent a6cf9b0956
commit 3cab65c9f0
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/parse.cpp
View file

@ -86,7 +86,7 @@ static inline void parse_reduce_11(std::string *lhs, unsigned char c1, unsigned
grammar->add_rule({item_t(*lhs, {symbol_t::make_char(c)}), vars, std::string()});
}
static inline rhs_t * parse_reduce_12(__attribute__((unused)) grammar_t *grammar) {return new rhs_t();}
static inline rhs_t * parse_reduce_12(__attribute__((unused)) grammar_t *grammar) {return new rhs_t;}
static inline rhs_t * parse_reduce_13(rhs_t *rhs, symbol_t *sym, var_t *var, __attribute__((unused)) grammar_t *grammar) {
rhs->first.push_back(*sym);

27
src/parse.y
View file

@ -104,7 +104,7 @@ directive |= SYMBOL(lhs) "|=" '(' CHAR(c1) "..." CHAR(c2) ')' ';' {
}
rhs |= [new rhs_t()]
rhs |= [new rhs_t]
rhs |= rhs(=rhs) symbol(sym) variable(var) {
rhs->first.push_back(*sym);
@ -123,16 +123,17 @@ rhs |= rhs(=rhs) STRING(str) {
}
variable |= [new var_t]
variable |= '(' consume(consume) csymbol(var) ')' [new var_t(*var, consume)]
variable |= [new var_t]
variable |= '(' consume(consume) csymbol(var) ')'
[new var_t(*var, consume)]
consume |= [false]
consume |= '=' [true]
consume |= [false]
consume |= '=' [true]
action |= ';' [new std::string]
action |= BLOCK(=v) [v]
action |= SQBLOCK(v) [new std::string("return " + *v + ";")]
action |= ';' [new std::string]
action |= BLOCK(=v) [v]
action |= SQBLOCK(v) [new std::string("return " + *v + ";")]
namespace |= csymbol(v) [new std::vector<std::string> {*v}]
@ -142,11 +143,11 @@ namespace |= namespace(=ns) "::" csymbol(v) {
}
symbol |= SYMBOL(v) [new symbol_t(symbol_t::make_nonterm(*v))]
symbol |= term(=v) [v]
symbol |= SYMBOL(v) [new symbol_t(symbol_t::make_nonterm(*v))]
symbol |= term(=v) [v]
term |= SYMBOL_UC(v) [new symbol_t(symbol_t::make_term(*v))]
term |= CHAR(v) [new symbol_t(symbol_t::make_char(v))]
term |= SYMBOL_UC(v) [new symbol_t(symbol_t::make_term(*v))]
term |= CHAR(v) [new symbol_t(symbol_t::make_char(v))]
csymbol |= SYMBOL_UC(=v) [v]
csymbol |= SYMBOL(=v) [v]
csymbol |= SYMBOL(=v) [v]