brozek/SLOTH
Archived
1
0
Fork 0
Code Activity

Fixed error with lambda functions not parsing correctly

Browse source
This commit is contained in:
Brandon Rozek 2018-09-28 15:28:15 -04:00
parent 33bb265d27
commit 7d044f5698
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/operations/node.cpp
View file

@ -54,7 +54,7 @@ void print_tree(struct Node* node, uint tabs) {
case WHILE: std::cout << "WHILE:" << std::endl; break; case WHILE: std::cout << "WHILE:" << std::endl; break;
case PRINT: std::cout << "PRINT:" << std::endl; break; case PRINT: std::cout << "PRINT:" << std::endl; break;
case INPUT: std::cout << "INPUT:" << std::endl; break; case INPUT: std::cout << "INPUT:" << std::endl; break;
case LAMBDA: std::cout << "LAMBDA:" << std::endl; break; case LAMBDATAG: std::cout << "LAMBDA:" << std::endl; break;
case CALLFUNC: std::cout << "FUNCCALL:" << std::endl; break; case CALLFUNC: std::cout << "FUNCCALL:" << std::endl; break;
case STATEMENT: std::cout << "STATEMENT:" << std::endl; break; case STATEMENT: std::cout << "STATEMENT:" << std::endl; break;
case VALUE: case VALUE:
@ -92,7 +92,7 @@ struct Value* eval_expression(struct Node* node, struct Environment* env) {
struct Value* val1 = nullptr; struct Value* val1 = nullptr;
struct Value* val2 = nullptr; struct Value* val2 = nullptr;
// struct Value* val3 = nullptr; // struct Value* val3 = nullptr;
if (node->num_children > 0 && node->type != LAMBDA) { if (node->num_children > 0 && node->type != LAMBDATAG) {
val1 = eval_expression(node->children[0], env); val1 = eval_expression(node->children[0], env);
if (node->num_children > 1) { if (node->num_children > 1) {
val2 = eval_expression(node->children[1], env); val2 = eval_expression(node->children[1], env);
@ -103,7 +103,7 @@ struct Value* eval_expression(struct Node* node, struct Environment* env) {
} }
switch(node->type) { switch(node->type) {
case LAMBDA: return make_expression(node); break; case LAMBDATAG: return make_expression(node); break;
case CALLFUNC: case CALLFUNC:
check_num_nodes(node, 2, "cannot have more than two nodes for a function call."); check_num_nodes(node, 2, "cannot have more than two nodes for a function call.");
tempNode = get_expression(get_value(find_variable(env, node->children[0]->id))); tempNode = get_expression(get_value(find_variable(env, node->children[0]->id)));

2
src/parser/lexer.l
View file

@ -41,7 +41,7 @@ DIGIT [0-9]
"while" {return WHILE;} "while" {return WHILE;}
"print" {return PRINT;} "print" {return PRINT;}
"input" {return INPUT;} "input" {return INPUT;}
"lambda" {return LAMBDA;} "lambda" {return LAMBDATAG;}
":" {return COLON;} ":" {return COLON;}
"true" {yylval.value = new Node(VALUE, make_true(), ""); return VALUE;} "true" {yylval.value = new Node(VALUE, make_true(), ""); return VALUE;}
"false" {yylval.value = new Node(VALUE, make_false(), ""); return VALUE;} "false" {yylval.value = new Node(VALUE, make_false(), ""); return VALUE;}