Fixed problem on returning from a function to the caller's context.

Author: luizfar

runner.html

@@ -15,13 +15,24 @@
     <script src="src/jazz.js"></script>
 
     <script type="jazz">
-      class Person {
-        def greet() {
-          log "hi"
+      person = (_name) {
+        priv = () {
+          log "ha!"
+        }
+        
+        {
+          name = _name
+          talk = () {
+            priv()
+            log "hihi"
+            log "my name is " + name
+          }
         }
       }
-      p = Person.new()
-      p.greet()
+      
+      p = person("bruno")
+      p.talk()
+      
     </script>
       f = () {
         x = 1

spec/jazz.function.spec.js

@@ -111,5 +111,34 @@ describe("Jazz interpreter for functions", function () {
       'f()');
     expect(console.content).toEqual("1\n2");
   });
+  
+  it("should return to the function's caller's context", function () {
+    var code =
+      'f = () {\n' +
+      '  x = 1\n' +
+      '  () {\n' +
+      '    log x\n' +
+      '  }\n' +
+      '}\n' +
+      'k = f()\n' +
+      'log x';
+    expect(function () { jazz.execute(code); }).toThrow("Unknown identifier: x");
+  });
+  
+  it("should return to the function's caller's context - more levels", function () {
+    jazz.execute(
+      'f = () {\n' +
+      '  g = () {\n' +
+      '    log 2\n' +
+      '  }\n' +
+      '  h = () {\n' +
+      '    g()\n' +
+      '    log 3\n' +
+      '  }\n' +
+      '}\n' +
+      'f()()\n' +
+      'log 4');
+    expect(console.content).toEqual("2\n3\n4");
+  });
 
 });

src/functionParser.js

@@ -52,6 +52,7 @@ jazz.FunctionParser = function (lexer, runtime, expressionParser) {
     functionParentContext = _function.context.parent;
 
     _function.invoke = function (receiver, args) {
+      var callingContext = runtime.currentContext;
       runtime.currentContext = _function.context;
       util.each(_function.params, function (param, index) {
         runtime.currentContext.add({
@@ -66,7 +67,7 @@ jazz.FunctionParser = function (lexer, runtime, expressionParser) {
         returnValue = expression();
         expression = runtime.currentContext.removeExpression();
       }
-      runtime.currentContext = _function.context.parent;
+      runtime.currentContext = callingContext;
       return returnValue;
     }
     return _function;