Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/try catch #57

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature/try catch #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6be7eb2
pulling out just try/catch/finally logic
hath995 Apr 30, 2016
7e8d591
pulled statements from correct branch
hath995 May 1, 2016
ed4308c
merged correct catch scope creation
hath995 May 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
210 changes: 173 additions & 37 deletions interpreter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
* global scope object.
* @constructor
*/
var acorn = acorn || require('./acorn');
var Interpreter = function(code, opt_initFunc) {
if (typeof code == 'string') {
code = acorn.parse(code);
Expand Down Expand Up @@ -2151,22 +2152,22 @@ Interpreter.prototype['stepCallExpression'] = function() {
};

Interpreter.prototype['stepCatchClause'] = function() {
var state = this.stateStack[0];
var node = state.node;
if (!state.doneBody) {
state.doneBody = true;
var scope;
if (node.param) {
scope = this.createSpecialScope(this.getScope());
// Add the argument.
var paramName = this.createPrimitive(node.param.name);
this.setProperty(scope, paramName, state.throwValue);
var state = this.stateStack[0];
if(!state.done) {
state.done = true;
var scope;
if (state.node.param) {
scope = this.createSpecialScope(this.getScope());
// Add the argument.
var paramName = this.createPrimitive(state.node.param.name);
this.setProperty(scope, paramName, state.node.parameter);
}
this.stateStack.unshift({node:state.node.body, scope: scope});
}else{
this.stateStack.shift();
}
this.stateStack.unshift({node: node.body, scope: scope});
} else {
this.stateStack.shift();
}
};
}


Interpreter.prototype['stepConditionalExpression'] = function() {
var state = this.stateStack[0];
Expand Down Expand Up @@ -2197,6 +2198,7 @@ Interpreter.prototype['stepContinueStatement'] = function() {
label = node.label.name;
}
var state = this.stateStack[0];
var position = 0;
while (state &&
state.node.type != 'CallExpression' &&
state.node.type != 'NewExpression') {
Expand All @@ -2205,8 +2207,18 @@ Interpreter.prototype['stepContinueStatement'] = function() {
return;
}
}
this.stateStack.shift();
state = this.stateStack[0];

if(state.node.type == 'CatchClause') {
// if an unhandled exception is on the stack when returning, rethrow
this.stateStack.splice(position, 1, state.node.thrower);
position++;
}else if(state.node.type === 'TryStatement' && state.node.finalizer && !state.done) {
//before returning finish finally blocks
position++;
}else{
this.stateStack.splice(position, 1);
}
state = this.stateStack[position];
}
// Syntax error, do not allow this error to be trapped.
throw new SyntaxError('Illegal continue statement');
Expand Down Expand Up @@ -2450,8 +2462,7 @@ Interpreter.prototype['stepObjectExpression'] = function() {
}
};

Interpreter.prototype['stepProgram'] =
Interpreter.prototype['stepBlockStatement'];
Interpreter.prototype['stepProgram'] = Interpreter.prototype['stepBlockStatement'];

Interpreter.prototype['stepReturnStatement'] = function() {
var state = this.stateStack[0];
Expand All @@ -2461,15 +2472,25 @@ Interpreter.prototype['stepReturnStatement'] = function() {
this.stateStack.unshift({node: node.argument});
} else {
var value = state.value || this.UNDEFINED;
var position = 0;
do {
this.stateStack.shift();
if(state.node.type == 'CatchClause') {
// if an unhandled exception is on the stack when returning, rethrow
this.stateStack.splice(position, 1, state.node.thrower);
position++;
}else if(state.node.type === 'TryStatement' && state.node.finalizer && !state.done) {
//before returning finish finally blocks
position++;
}else{
this.stateStack.splice(position, 1);
}
if (this.stateStack.length == 0) {
// Syntax error, do not allow this error to be trapped.
throw new SyntaxError('Illegal return statement');
}
state = this.stateStack[0];
state = this.stateStack[position];
} while (state.node.type != 'CallExpression' &&
state.node.type != 'NewExpression');
state.node.type != 'NewExpression');
state.value = value;
}
};
Expand Down Expand Up @@ -2539,31 +2560,86 @@ Interpreter.prototype['stepThisExpression'] = function() {
throw 'No this expression found.';
};

Interpreter.prototype['stepTryStatement'] = function() {
var state = this.stateStack[0];
if(!state.done) {
if(!state.tried) {
state.tried = true;
this.stateStack.unshift({node: state.node.block})
}else{
if(state.node.finalizer) {
this.stateStack.unshift({node: state.node.finalizer});
}
state.done = true;
}
}else{
this.stateStack.shift();
this.stateStack[0].value = state.value;
}
}

Interpreter.prototype['stepThrowStatement'] = function() {
var state = this.stateStack[0];
var node = state.node;
if (!state.argument) {
if (!state.argument) { //calculate error object
state.argument = true;
this.stateStack.unshift({node: node.argument});
} else {
this.throwException(state.value);
}
};
/*
* find nearest try statements with only finally clauses
* delete their remaining try blocks and started finally blocks
* triger their finally blocks
* find the nearest try statement with a catch clause
* set that try statement to not trigger again
* trigger the catch block
* */
var try_statement = null;
var finallys_todo = [];
for(var i = 0;i < this.stateStack.length; i++) {
if(this.stateStack[i].node.type === 'TryStatement' && this.stateStack[i].node.handler && !this.stateStack[i].triggered) {
try_statement = this.stateStack[i].node;
this.stateStack[i].triggered = true;
finallys_todo.push(this.stateStack[i]);
break;
} else if(this.stateStack[i].node.type === 'TryStatement' && !this.stateStack[i].done) {
finallys_todo.push(this.stateStack[i]);
}
}
var position = 0;
var count = 0;
if(try_statement) {
var handler = try_statement.handler;
handler.parameter = state.value;
handler.thrower = state;
this.stateStack.shift()

for(var j = 0; j < finallys_todo.length; j++) {
while(this.stateStack[position] !== finallys_todo[j] && count < this.stateStack.length) {
count++;
this.stateStack.splice(position,1);
}
position++;
}

Interpreter.prototype['stepTryStatement'] = function() {
var state = this.stateStack[0];
var node = state.node;
if (!state.doneBlock) {
state.doneBlock = true;
this.stateStack.unshift({node: node.block});
} else if (!state.doneFinalizer && node.finalizer) {
state.doneFinalizer = true;
this.stateStack.unshift({node: node.finalizer});
} else {
this.stateStack.shift();
this.stateStack.splice(finallys_todo.length-1, 0, {node: handler});
}else if(finallys_todo.length > 0) {
this.stateStack.shift()

for(var j = 0; j < finallys_todo.length; j++) {
while(this.stateStack[position] !== finallys_todo[j] && count < this.stateStack.length) {
count++;
this.stateStack.splice(position,1);
}
position++;
}
this.stateStack.splice(finallys_todo.length, 0, state);
}else{
throw new Error("Uncaught exception")
}
}
};


Interpreter.prototype['stepUnaryExpression'] = function() {
var state = this.stateStack[0];
var node = state.node;
Expand Down Expand Up @@ -2674,9 +2750,69 @@ Interpreter.prototype['stepWithStatement'] = function() {
Interpreter.prototype['stepWhileStatement'] =
Interpreter.prototype['stepDoWhileStatement'];

Interpreter.prototype.extract = function extract(node) {
if(node.isPrimitive) {
return this.extractPrimitive(node);
}else if(node.parent === this.ARRAY) {
return this.extractArray(node);
}else if(node.parent === this.OBJECT) {
return this.extractObject(node);
}else if(node.parent === this.REGEXP) {
return this.extractPrimitive(node);
}else if(node.type === 'function') {
return this.extractFunction(node);
}else if(node.type === 'object' && node.parent.type === 'function') {
return this.extractClassObject(node);
}
}

Interpreter.prototype.extractFunction = function extractFunction(node) {
return {
type: 'function',
funcText: escodegen.generate(node.node),
createdIn: node.parentScope.scopeName
}
}

Interpreter.prototype.extractPrimitive = function extractPrimitive(node) {
return node.data;
}

Interpreter.prototype.extractArray = function extractArray(node) {
var result = [];
for(var index in node.properties) {
result[index] = this.extract(node.properties[index]);
};
return result;
}

Interpreter.prototype.extractClassObject = function extractClassObject(node) {
var result = {
type: 'object',
constructor: node.parent.node.id.name, properties: {}};
for(var prop in node.properties) {
result.properties[prop] = this.extract(node.properties[prop]);
}
return result;
}

Interpreter.prototype.extractObject = function extractObject(node) {
var result = {
type: 'object',
constructor: 'object', properties: {}};
for(var prop in node.properties) {
result.properties[prop] = this.extract(node.properties[prop]);
}
return result;
}


// Preserve top-level API functions from being pruned by JS compilers.
// Add others as needed.
var window = window || {};
window['Interpreter'] = Interpreter;
Interpreter.prototype['appendCode'] = Interpreter.prototype.appendCode;
Interpreter.prototype['step'] = Interpreter.prototype.step;
Interpreter.prototype['run'] = Interpreter.prototype.run;
var module = module || {};
module.exports = Interpreter;
Loading