Skip to content

Commit

Permalink
Just remove ret when formulating new env.
Browse files Browse the repository at this point in the history
  • Loading branch information
maryrosecook committed Mar 16, 2013
1 parent 5264f52 commit bbbfbc3
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions src/interpreter.js
Expand Up @@ -53,7 +53,7 @@
var value = assignmentValue(valueNode);

var env = assign(env, assignee, value);
return nreturn(env.ctx);
return rmRet(env);
})

.when("type_assignment", function(ast, env) {
Expand All @@ -68,7 +68,7 @@

var value = instantiateType(typeFn, typeIdentifier);
var env = assign(env, assignee, value);
return nreturn(env.ctx);
return rmRet(env);
})

.when("list_assignment", function(ast, env) {
Expand All @@ -85,7 +85,7 @@
list[operation](item);

var env = assign(env, assignee, currentListEval.val);
return nreturn(env.ctx);
return rmRet(env);
})

.when("invocation", function(ast, env) {
Expand All @@ -95,8 +95,8 @@
var param = resolve(interpretAst(Isla.Parser.extract(ast,
"invocation", 1),
env).val, env);
var returnVal = fn(env, param);
return nreturn(env.ctx, returnVal);
env.ret = fn(env, param);
return env;
})

.when("value", function(ast, env) {
Expand Down Expand Up @@ -297,14 +297,7 @@
return env;
}

var nreturn = function(ctx, ret) {
if(ret === undefined) {
return { ctx: ctx, ret: null };
}
else {
return { ctx: ctx, ret: ret };
}
}

exports.Interpreter.resolve = resolve;
exports.Interpreter.evaluateValue = evaluateValue;
Expand Down

0 comments on commit bbbfbc3

Please sign in to comment.