Changeset 27390 in project

Timestamp:

09/07/12 23:11:24 (9 years ago)

Author:

felix winkelmann

Message:

spock 0.9: now with less throwing up

Location:

release/4/spock

Files:

• tags/0.9 (copied) (copied from release/4/spock/trunk) (1 prop)
• tags/0.9/codegen.scm (modified) (2 diffs)
• tags/0.9/debug.js (modified) (1 diff)
• tags/0.9/runtime.js (modified) (3 diffs)
• tags/0.9/spock.setup (modified) (1 diff)
• tags/0.9/spock/library.scm (modified) (1 diff)
• tags/0.9/tests/cells.html (copied) (copied from release/4/spock/branches/nothrow/tests/cells.html)
• tags/0.9/tests/cells.scm (copied) (copied from release/4/spock/branches/nothrow/tests/cells.scm)
• tags/0.9/tests/drag.html (modified) (1 diff)
• tags/0.9/tests/srfi-25.scm (copied) (copied from release/4/spock/branches/nothrow/tests/srfi-25.scm)
• tags/0.9/tests/threads.html (deleted)
• tags/0.9/tests/threads.scm (deleted)
• trunk (modified) (1 prop)
• trunk/codegen.scm (modified) (2 diffs)
• trunk/debug.js (modified) (1 diff)
• trunk/runtime.js (modified) (3 diffs)
• trunk/spock.setup (modified) (1 diff)
• trunk/spock/library.scm (modified) (1 diff)
• trunk/tests/cells.html (copied) (copied from release/4/spock/branches/nothrow/tests/cells.html)
• trunk/tests/cells.scm (copied) (copied from release/4/spock/branches/nothrow/tests/cells.scm)
• trunk/tests/drag.html (modified) (1 diff)
• trunk/tests/srfi-25.scm (copied) (copied from release/4/spock/branches/nothrow/tests/srfi-25.scm)
• trunk/tests/threads.html (deleted)
• trunk/tests/threads.scm (deleted)

release/4/spock/tags/0.9/codegen.scm

@@ -95 +95 @@
                 (when dest (emit "\t// " dest))
                 (when (and (pair? llist) (pair? (cdr llist))) ;XXX not really correct
-                  (emit nl "SPOCK.count(arguments" 
+                  (emit nl "var r = SPOCK.count(arguments" 
                         (if (and debug-mode dest)
                             (string-append ", " (constant (stringify dest)))
                             "")
-                        ");"))
+                        ");")
+                  (emit nl "if(r) return r;"))
                 (when rest
                   (emit nl "var " rest " = SPOCK.rest(arguments, "  (- (length vars) 1))
@@ -177 +178 @@
            (indent
             (lambda ()
+              ;;XXX this will not unwind, but at least decrease the counter
               (emit nl "SPOCK.count(arguments")
               (if dest

release/4/spock/tags/0.9/debug.js

@@ -41 +41 @@
     if(--SPOCK.stack <= 0) {
         ++SPOCK.restartCount;
-        throw new SPOCK.Continuation(args.callee, Array.prototype.slice.call(args));
+        return new SPOCK.Continuation(args.callee, Array.prototype.slice.call(args));
     }
 
     if(loc) SPOCK.trace(loc, args);
+
+    return false;
 };
 

release/4/spock/tags/0.9/runtime.js

@@ -255 +255 @@
 SPOCK.count = function(args, loc) {
     if(--SPOCK.stack <= 0) 
-        throw new SPOCK.Continuation(args.callee, Array.prototype.slice.call(args));
+        return new SPOCK.Continuation(args.callee, Array.prototype.slice.call(args));
+    else return false;
 };
 
 SPOCK.rest = function(args, count, loc) {
     var rest = null;
-
+    
+    // this will not unwind, but decrease the counter
     SPOCK.count(args, loc);
 
@@ -273 +275 @@
 SPOCK.run = function(func) {    // optional arguments
     function terminate(result) {
-        throw new SPOCK.Result(result);
+        return new SPOCK.Result(result);
     }
 
@@ -304 +306 @@
 
     while(true) {
-        try {
-            result = func.apply(SPOCK.global, args);
-            break;
-        }
-        catch(x) {
-            if(x instanceof SPOCK.Continuation) {
-                SPOCK.stack = SPOCK.STACKSIZE;
-                func = x.k_callee;
-                args = x.k_arguments;
-            }
-            else if(x instanceof SPOCK.Result) {
-                result = x.value;
-                break;
-            }
-            else {
-                restore();
-                SPOCK.error(x);
-            }
-        }
-    }
-
-    restore();
+        result = func.apply(SPOCK.global, args);
+
+        if(result instanceof SPOCK.Continuation) {
+            SPOCK.stack = SPOCK.STACKSIZE;
+            func = result.k_callee;
+            args = result.k_arguments;
+        }
+        else if(result instanceof SPOCK.Result) {
+            restore();
+            return result.value;
+        }
+        else {
+            restore();
+            SPOCK.error("unexpected return of non-continuation", result);
+        }
+    }
+
     return result;
 };

release/4/spock/tags/0.9/spock.setup

@@ -73 +73 @@
  '("spock.so" "spock" "spock.import.so"
    "spock-compiler.so" "spock-compiler.import.so")
- '((version 0.08)))
+ '((version 0.09)))
 
 (install-program
  'chicken-spock
  (list executable)
- '((version 0.08)))
+ '((version 0.09)))

release/4/spock/tags/0.9/spock/library.scm

@@ -1513 +1513 @@
            (lambda (k)
              (proc (%get-context k))
-             ((%native-lambda "throw new SPOCK.Result(undefined);")))))
+             ((%native-lambda "return new SPOCK.Result(undefined);")))))
 
         ;;XXX currently undocumented and untested

release/4/spock/tags/0.9/tests/drag.html

@@ -15 +15 @@
         right-margin: auto;
         left: 0px;
-        top-margin; auto;
+        top-margin: auto;
         bottom: 0px;
       }

release/4/spock/trunk/codegen.scm

@@ -95 +95 @@
                 (when dest (emit "\t// " dest))
                 (when (and (pair? llist) (pair? (cdr llist))) ;XXX not really correct
-                  (emit nl "SPOCK.count(arguments" 
+                  (emit nl "var r = SPOCK.count(arguments" 
                         (if (and debug-mode dest)
                             (string-append ", " (constant (stringify dest)))
                             "")
-                        ");"))
+                        ");")
+                  (emit nl "if(r) return r;"))
                 (when rest
                   (emit nl "var " rest " = SPOCK.rest(arguments, "  (- (length vars) 1))
@@ -177 +178 @@
            (indent
             (lambda ()
+              ;;XXX this will not unwind, but at least decrease the counter
               (emit nl "SPOCK.count(arguments")
               (if dest

release/4/spock/trunk/debug.js

@@ -41 +41 @@
     if(--SPOCK.stack <= 0) {
         ++SPOCK.restartCount;
-        throw new SPOCK.Continuation(args.callee, Array.prototype.slice.call(args));
+        return new SPOCK.Continuation(args.callee, Array.prototype.slice.call(args));
     }
 
     if(loc) SPOCK.trace(loc, args);
+
+    return false;
 };
 

release/4/spock/trunk/runtime.js

@@ -255 +255 @@
 SPOCK.count = function(args, loc) {
     if(--SPOCK.stack <= 0) 
-        throw new SPOCK.Continuation(args.callee, Array.prototype.slice.call(args));
+        return new SPOCK.Continuation(args.callee, Array.prototype.slice.call(args));
+    else return false;
 };
 
 SPOCK.rest = function(args, count, loc) {
     var rest = null;
-
+    
+    // this will not unwind, but decrease the counter
     SPOCK.count(args, loc);
 
@@ -273 +275 @@
 SPOCK.run = function(func) {    // optional arguments
     function terminate(result) {
-        throw new SPOCK.Result(result);
+        return new SPOCK.Result(result);
     }
 
@@ -304 +306 @@
 
     while(true) {
-        try {
-            result = func.apply(SPOCK.global, args);
-            break;
-        }
-        catch(x) {
-            if(x instanceof SPOCK.Continuation) {
-                SPOCK.stack = SPOCK.STACKSIZE;
-                func = x.k_callee;
-                args = x.k_arguments;
-            }
-            else if(x instanceof SPOCK.Result) {
-                result = x.value;
-                break;
-            }
-            else {
-                restore();
-                SPOCK.error(x);
-            }
-        }
-    }
-
-    restore();
+        result = func.apply(SPOCK.global, args);
+
+        if(result instanceof SPOCK.Continuation) {
+            SPOCK.stack = SPOCK.STACKSIZE;
+            func = result.k_callee;
+            args = result.k_arguments;
+        }
+        else if(result instanceof SPOCK.Result) {
+            restore();
+            return result.value;
+        }
+        else {
+            restore();
+            SPOCK.error("unexpected return of non-continuation", result);
+        }
+    }
+
     return result;
 };

release/4/spock/trunk/spock.setup

@@ -73 +73 @@
  '("spock.so" "spock" "spock.import.so"
    "spock-compiler.so" "spock-compiler.import.so")
- '((version 0.08)))
+ '((version 0.09)))
 
 (install-program
  'chicken-spock
  (list executable)
- '((version 0.08)))
+ '((version 0.09)))

release/4/spock/trunk/spock/library.scm

@@ -1513 +1513 @@
            (lambda (k)
              (proc (%get-context k))
-             ((%native-lambda "throw new SPOCK.Result(undefined);")))))
+             ((%native-lambda "return new SPOCK.Result(undefined);")))))
 
         ;;XXX currently undocumented and untested

release/4/spock/trunk/tests/drag.html

@@ -15 +15 @@
         right-margin: auto;
         left: 0px;
-        top-margin; auto;
+        top-margin: auto;
         bottom: 0px;
       }