mirror/otto
1
0
Fork 0
mirror of https://github.com/robertkrimen/otto synced 2025-10-12 20:27:30 +08:00
Code Issues Releases Wiki Activity

tryEvaluate => tryCatchEvaluate

Browse Source
This commit is contained in:
Robert Krimen 2013-04-20 22:13:19 -07:00
parent 2b3f317e3a
commit 2277e46d05
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
evaluate_statement.go
View File

@ -1,11 +1,13 @@
package otto
func (self *_runtime) evaluateTryCatch(node *_tryCatchNode) Value {
tryValue, throw, throwValue, other := self.tryEvaluate(func() Value {
resultValue, throw, throwValue, other := self.tryCatchEvaluate(func() Value {
return self.evaluate(node.Try)
})
if throw != false && node.Catch != nil {
// Reset the throw status, so we can tell if catch { ... }
// throws anything
throw = false
lexicalEnvironment := self._executionContext(0).newDeclarativeEnvironment(self)
@ -15,7 +17,8 @@ func (self *_runtime) evaluateTryCatch(node *_tryCatchNode) Value {
// TODO If necessary, convert TypeError<runtime> => TypeError
// That, is, such errors can be thrown despite not being JavaScript "native"
self.localSet(node.Catch.Identifier, throwValue)
tryValue, throw, throwValue, other = self.tryEvaluate(func() Value {
// We ignore the resultValue of the catch { ... }
_, throw, throwValue, other = self.tryCatchEvaluate(func() Value {
return self.evaluate(node.Catch.Body)
})
}
@ -27,16 +30,17 @@ func (self *_runtime) evaluateTryCatch(node *_tryCatchNode) Value {
}
}
if other != nil {
panic(*other) // Re-throw continue, break, return, etc.
}
// Catch threw something
// It does not matter which order we evaluate these, as
// they're mutually exclusive
if throw {
// Catch threw something
self.Throw(throwValue)
} else if other != nil {
// Re-throw continue, break, return, etc.
panic(*other)
}
return tryValue
return resultValue
}
func (self *_runtime) evaluateVariableDeclarationList(node *_variableDeclarationListNode) Value {

9
runtime.go
View File

@ -186,7 +186,12 @@ func (self *_runtime) Call(function *_object, this Value, argumentList []Value,
return
}
func (self *_runtime) tryEvaluate(inner func() Value) (tryValue Value, throw bool, throwValue Value, other *_result) {
func (self *_runtime) tryCatchEvaluate(inner func() Value) (resultValue Value, throw bool, throwValue Value, other *_result) {
// resultValue = The value of the block (e.g. the last statement)
// throw = Something was thrown
// throwValue = The value of what was thrown
// other = Something that changes flow (return, break, continue) that is not a throw
// Otherwise, some sort of unknown panic happened, we'll just propagate it
defer func() {
if caught := recover(); caught != nil {
switch caught := caught.(type) {
@ -215,7 +220,7 @@ func (self *_runtime) tryEvaluate(inner func() Value) (tryValue Value, throw boo
}
}()
tryValue = inner()
resultValue = inner()
return
}