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

Removed property capture without 'this'.

Browse Source
This commit is contained in:
yhirose 2015-07-25 18:59:54 -04:00
parent 0e0e3f6f24
commit 4fbbdf708a
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
language/culebra.h
View File

@ -86,7 +86,7 @@ inline peglib::peg& get_parser()
throw std::logic_error("invalid peg grammar"); throw std::logic_error("invalid peg grammar");
} }
parser.enable_ast(true, { "PARAMETERS", "ARGUMENTS" }); parser.enable_ast(true, { "PARAMETERS", "ARGUMENTS", "OBJECT" });
} }
return parser; return parser;
@ -355,9 +355,6 @@ struct Environment
if (dic_.find(s) != dic_.end()) { if (dic_.find(s) != dic_.end()) {
return true; return true;
} }
if (object.has_property(s)) {
return true;
}
return outer && outer->has(s); return outer && outer->has(s);
} }
@ -365,9 +362,6 @@ struct Environment
if (dic_.find(s) != dic_.end()) { if (dic_.find(s) != dic_.end()) {
return dic_.at(s).val; return dic_.at(s).val;
} }
if (object.has_property(s)) {
return object.get_property(s);
}
if (outer) { if (outer) {
return outer->get(s); return outer->get(s);
} }
@ -400,7 +394,6 @@ struct Environment
} }
std::shared_ptr<Environment> outer; std::shared_ptr<Environment> outer;
ObjectValue object;
private: private:
struct Symbol { struct Symbol {
@ -513,6 +506,7 @@ struct Eval
case "IF"_: return eval_if(ast, env); case "IF"_: return eval_if(ast, env);
case "FUNCTION"_: return eval_function(ast, env); case "FUNCTION"_: return eval_function(ast, env);
case "CALL"_: return eval_call(ast, env); case "CALL"_: return eval_call(ast, env);
case "BLOCK"_: return eval_block(ast, env);
case "ASSIGNMENT"_: return eval_assignment(ast, env); case "ASSIGNMENT"_: return eval_assignment(ast, env);
case "LOGICAL_OR"_: return eval_logical_or(ast, env); case "LOGICAL_OR"_: return eval_logical_or(ast, env);
case "LOGICAL_AND"_: return eval_logical_and(ast, env); case "LOGICAL_AND"_: return eval_logical_and(ast, env);
@ -650,9 +644,6 @@ private:
*pf.params, *pf.params,
[=](std::shared_ptr<Environment> callEnv) { [=](std::shared_ptr<Environment> callEnv) {
callEnv->initialize("this", val, false); callEnv->initialize("this", val, false);
if (val.type == Value::Object) {
callEnv->object = val.to_object();
}
return pf.eval(callEnv); return pf.eval(callEnv);
} }
)); ));
@ -667,6 +658,10 @@ private:
return std::move(val); return std::move(val);
} }
static Value eval_block(const peglib::Ast& ast, std::shared_ptr<Environment> env) {
return Value();
}
static Value eval_logical_or(const peglib::Ast& ast, std::shared_ptr<Environment> env) { static Value eval_logical_or(const peglib::Ast& ast, std::shared_ptr<Environment> env) {
assert(ast.nodes.size() > 1); // if the size is 1, thes node will be hoisted. assert(ast.nodes.size() > 1); // if the size is 1, thes node will be hoisted.
Value val; Value val;

2
language/samples/test.cul
View File

@ -75,7 +75,7 @@ test_object = fn () {
} }
assert(o.size() == 4) assert(o.size() == 4)
assert(o.f1(10) == 133) assert(o.f1(10) == 133)
assert(o.f2(10) == 133) assert(o.f2(10) == 11)
} }
test_object_factory = fn () { test_object_factory = fn () {