AIR/cpp-peglib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-peglib.git synced 2024-12-22 20:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed keyword boundary problem.

Browse Source
This commit is contained in:
yhirose 2015-08-05 22:51:39 -04:00
parent 58edb7bfb8
commit b2a4ad99a0
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
language/culebra/culebra.h
View File

@ -11,8 +11,8 @@ const auto grammar_ = R"(
STATEMENTS <- (STATEMENT (';' _)?)* STATEMENTS <- (STATEMENT (';' _)?)*
STATEMENT <- DEBUGGER / RETURN / EXPRESSION STATEMENT <- DEBUGGER / RETURN / EXPRESSION
DEBUGGER <- 'debugger' _ DEBUGGER <- debugger
RETURN <- 'return' __ '\n' / 'return' _ EXPRESSION? RETURN <- return nl / return EXPRESSION?
EXPRESSION <- ASSIGNMENT / LOGICAL_OR EXPRESSION <- ASSIGNMENT / LOGICAL_OR
@ -32,12 +32,12 @@ const auto grammar_ = R"(
INDEX <- '[' _ EXPRESSION ']' _ INDEX <- '[' _ EXPRESSION ']' _
DOT <- '.' _ IDENTIFIER DOT <- '.' _ IDENTIFIER
WHILE <- 'while' _ EXPRESSION BLOCK WHILE <- while EXPRESSION BLOCK
IF <- 'if' _ EXPRESSION BLOCK ('else' _ 'if' _ EXPRESSION BLOCK)* ('else' _ BLOCK)? IF <- if EXPRESSION BLOCK (else if EXPRESSION BLOCK)* (else BLOCK)?
PRIMARY <- WHILE / IF / FUNCTION / OBJECT / ARRAY / UNDEFINED / BOOLEAN / NUMBER / IDENTIFIER / STRING / INTERPOLATED_STRING / '(' _ EXPRESSION ')' _ PRIMARY <- WHILE / IF / FUNCTION / OBJECT / ARRAY / UNDEFINED / BOOLEAN / NUMBER / IDENTIFIER / STRING / INTERPOLATED_STRING / '(' _ EXPRESSION ')' _
FUNCTION <- 'fn' _ PARAMETERS BLOCK FUNCTION <- fn PARAMETERS BLOCK
PARAMETERS <- '(' _ (PARAMETER (',' _ PARAMETER)*)? ')' _ PARAMETERS <- '(' _ (PARAMETER (',' _ PARAMETER)*)? ')' _
PARAMETER <- MUTABLE IDENTIFIER PARAMETER <- MUTABLE IDENTIFIER
@ -57,22 +57,31 @@ const auto grammar_ = R"(
ARRAY <- '[' _ (EXPRESSION (',' _ EXPRESSION)*)? ']' _ ARRAY <- '[' _ (EXPRESSION (',' _ EXPRESSION)*)? ']' _
UNDEFINED <- < 'undefined' > _ UNDEFINED <- < 'undefined' > __
BOOLEAN <- < ('true' / 'false') > _ BOOLEAN <- < ('true' / 'false') > __
MUTABLE <- (< 'mut' > __)?
~debugger <- 'debugger' __
~return <- 'return' __
~while <- 'while' __
~if <- 'if' __
~else <- 'else' __
~fn <- 'fn' __
NUMBER <- < [0-9]+ > _ NUMBER <- < [0-9]+ > _
STRING <- ['] < (!['] .)* > ['] _ STRING <- ['] < (!['] .)* > ['] _
INTERPOLATED_STRING <- '"' ('{' _ EXPRESSION '}' / INTERPOLATED_CONTENT)* '"' _ INTERPOLATED_STRING <- '"' ('{' _ EXPRESSION '}' / INTERPOLATED_CONTENT)* '"' _
INTERPOLATED_CONTENT <- (!["{] .) (!["{] .)* INTERPOLATED_CONTENT <- (!["{] .) (!["{] .)*
MUTABLE <- < 'mut'? > _ ~_ <- (Space / End)*
__ <- ![a-zA-Z0-9_] (Space / End)*
~_ <- (Space / EndOfLine / Comment)* ~nl <- Space* End _
~__ <- (Space / Comment)* ~Space <- ' ' / '\t' / Comment
Space <- ' ' / '\t' ~End <- EndOfLine / EndOfFile
Comment <- '/*' (!'*/' .)* '*/' / ('#' / '//') (!End .)* &End
EndOfLine <- '\r\n' / '\n' / '\r' EndOfLine <- '\r\n' / '\n' / '\r'
EndOfFile <- !. EndOfFile <- !.
Comment <- '/*' (!'*/' .)* '*/' / ('#' / '//') (!(EndOfLine / EndOfFile) .)* &(EndOfLine / EndOfFile)
)"; )";
@ -805,6 +814,11 @@ private:
return Value(ret); return Value(ret);
} }
bool is_keyword(const std::string& ident) const {
static std::set<std::string> keywords = { "undefined", "true", "false", "mut", "debugger", "return", "while", "if", "else", "fn" };
return keywords.find(ident) != keywords.end();
}
Value eval_assignment(const peglib::Ast& ast, std::shared_ptr<Environment> env) { Value eval_assignment(const peglib::Ast& ast, std::shared_ptr<Environment> env) {
auto end = ast.nodes.size() - 1; auto end = ast.nodes.size() - 1;
@ -812,11 +826,13 @@ private:
auto val = eval(*ast.nodes[end], env); auto val = eval(*ast.nodes[end], env);
if (ast.nodes.size() == 3) { if (ast.nodes.size() == 3) {
const auto& var = ast.nodes[1]->token; const auto& ident = ast.nodes[1]->token;
if (env->has(var)) { if (env->has(ident)) {
env->assign(var, val); env->assign(ident, val);
} else if (is_keyword(ident)) {
throw std::runtime_error("left-hand side is invalid variable name.");
} else { } else {
env->initialize(var, val, mut); env->initialize(ident, val, mut);
} }
return std::move(val); return std::move(val);
} else { } else {