Merge pull request #86 from mohayonao/v0.0.59

V0.0.59
mohayonao · Jun 18, 2014 · 9dda8b6 · 9dda8b6
2 parents a92400a + 135ebbd
commit 9dda8b6
Show file tree

Hide file tree

Showing 17 changed files with 332 additions and 117 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scscript",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "author": "Nao Yonamine <mohayonao@gmail.com>",
   "homepage": "http://mohayonao.github.io/SCScript/",
   "bugs": "https://github.com/mohayonao/SCScript/issues",

diff --git a/src/sc/classlib/Core/Function.js b/src/sc/classlib/Core/Function.js
@@ -30,20 +30,24 @@ SCScript.install(function(sc) {
 
     spec.shallowCopy = utils.nop;
 
+    var function$run = function(bytecode, args) {
+      return bytecode.reset().run(args);
+    };
+
     spec.choose = function() {
       return this.value();
     };
 
     spec.update = function() {
-      return this._.reset().run(arguments);
+      return function$run(this._bytecode, arguments);
     };
 
     spec.value = function() {
-      return this._.reset().run(arguments);
+      return function$run(this._bytecode, arguments);
     };
 
     spec.valueArray = function($args) {
-      return this._.reset().run($args.asArray()._);
+      return function$run(this._bytecode, $args.asArray()._);
     };
 
     var envir = function(func, args) {
@@ -60,13 +64,11 @@ SCScript.install(function(sc) {
     };
 
     spec.valueEnvir = function() {
-      var args = envir(this._, arguments);
-      return this._.reset().run(args);
+      return function$run(this._bytecode, envir(this._bytecode, arguments));
     };
 
     spec.valueArrayEnvir = function($args) {
-      var args = envir(this._, $args.asArray()._);
-      return this._.reset().run(args);
+      return function$run(this._bytecode, envir(this._bytecode, $args.asArray()._));
     };
 
     spec.functionPerformList = fn(function($selector, $arglist) {

diff --git a/src/sc/classlib/Core/Object.js b/src/sc/classlib/Core/Object.js
@@ -286,7 +286,8 @@ SCScript.install(function(sc) {
               },
               function() {
                 return $this.reset();
-              }
+              },
+              $.NOP
             ];
           }));
         } ];
@@ -522,7 +523,7 @@ SCScript.install(function(sc) {
 
     spec.yield = function() {
       bytecode.yield(this);
-      return this;
+      return $nil;
     };
 
     // TODO: implements alwaysYield

diff --git a/src/sc/classlib/Core/Object_test.js b/src/sc/classlib/Core/Object_test.js
@@ -1167,7 +1167,7 @@
       this.stub(bytecode, "yield");
 
       test = instance.yield();
-      expect(test).to.equal(instance);
+      expect(test).to.be.a("SCNil");
       expect(bytecode.yield).to.be.calledWith(instance);
     }));
     it.skip("#alwaysYield", function() {

diff --git a/src/sc/classlib/Core/Thread.js b/src/sc/classlib/Core/Thread.js
@@ -23,7 +23,7 @@ SCScript.install(function(sc) {
       if ($func.__tag !== sc.TAG_FUNC) {
         throw new Error("Thread.init failed");
       }
-      this._bytecode = $func._.setOwner(this);
+      this._bytecode = $func._bytecode.setOwner(this);
       this._state    = sc.STATE_INIT;
       this._parent   = null;
       this._randgen  = new random.RandGen((Math.random() * 4294967295) >>> 0);

diff --git a/src/sc/classlib/Core/Thread_test.js b/src/sc/classlib/Core/Thread_test.js
@@ -172,7 +172,8 @@
               },
               function() {
                 return $$(3).yield();
-              }
+              },
+              $.NOP
             ];
           }).value();
         },
@@ -183,7 +184,8 @@
           return $$([ 5, 6, 7 ]).do($$(function($_) {
             return $_.yield();
           }));
-        }
+        },
+        $.NOP
       ]);
 
       expect(instance.next($inval), 0).to.equal($inval);

diff --git a/src/sc/classlib/Streams/Patterns.js b/src/sc/classlib/Streams/Patterns.js
@@ -219,7 +219,8 @@ SCScript.install(function(sc) {
             counter += 1;
             $inval   = $outval.yield();
             return $inval;
-          }
+          },
+          $.NOP
         ];
       }));
 
@@ -279,7 +280,8 @@ SCScript.install(function(sc) {
             counter += 1;
             $inval   = $outval.yield();
             return $inval;
-          }
+          },
+          $.NOP
         ];
       }));
 

diff --git a/src/sc/classlib/Streams/Stream.js b/src/sc/classlib/Streams/Stream.js
@@ -126,7 +126,8 @@ SCScript.install(function(sc) {
                 for (i = 0; i < skipSize; ++i) {
                   $this.next();
                 }
-              }
+              },
+              $.NOP
             ];
           }).loop();
         } ];
@@ -328,19 +329,22 @@ SCScript.install(function(sc) {
       $reset = $false;
       return $("Routine").new($.Function(function() {
         var $inval;
-        return [ function(_arg0) {
-          $inval = _arg0;
-          if ($reset.__bool__()) {
-            $this.reset();
-            $stream.reset();
-          }
-          $reset = $true;
-          $inval = $this.embedInStream($inval);
-          return $inval;
-        },
-        function() {
-          return $stream.embedInStream($inval);
-        } ];
+        return [
+          function(_arg0) {
+            $inval = _arg0;
+            if ($reset.__bool__()) {
+              $this.reset();
+              $stream.reset();
+            }
+            $reset = $true;
+            $inval = $this.embedInStream($inval);
+            return $inval;
+          },
+          function() {
+            return $stream.embedInStream($inval);
+          },
+          $.NOP
+        ];
       }));
     }, "stream");
 

diff --git a/src/sc/classlib/Streams/Stream_test.js b/src/sc/classlib/Streams/Stream_test.js
@@ -510,7 +510,8 @@
           },
           function() {
             return $$(5).yield();
-          }
+          },
+          $.NOP
         ];
       }));
 

diff --git a/src/sc/lang/bytecode.js b/src/sc/lang/bytecode.js
@@ -32,6 +32,9 @@
       this._argNames = [];
       this._argVals  = [];
     }
+    if (code.length > 1) {
+      this._freeFunc = code.pop();
+    }
     this._code   = code;
     this._length = code.length;
     return this.reset();
@@ -47,6 +50,13 @@
     return this;
   };
 
+  Bytecode.prototype.free = function() {
+    if (this._freeFunc) {
+      this._freeFunc();
+    }
+    return this;
+  };
+
   Bytecode.prototype.setOwner = function($owner) {
     this._$owner = $owner;
     return this;
@@ -87,12 +97,15 @@
     this.state = sc.STATE_RUNNING;
 
     for (i = 0; i < length; ++i) {
-      result = code[i].apply(this, args);
+      result = this.update(code[i].apply(this, args));
       if (this.state === sc.STATE_BREAK) {
         this._iter = null;
         break;
       }
     }
+    if (this._freeFunc) {
+      this._freeFunc();
+    }
 
     bytecode.current = this._parent;
     this._parent = null;
@@ -160,7 +173,7 @@
         iter = null;
       }
 
-      result = code[this._index].apply(this, args);
+      result = this.update(code[this._index].apply(this, args));
 
       this._index += 1;
       if (this._index >= length) {
@@ -186,12 +199,14 @@
     }
     if (!this.result) {
       this.state = sc.STATE_DONE;
+      this.free();
     }
     if (this._parent) {
       if (this.state === sc.STATE_DONE) {
         this._parent.state = sc.STATE_RUNNING;
       } else {
         this._parent.state = sc.STATE_SUSPENDED;
+        this.free();
       }
       this._parent.purge();
     }
@@ -205,17 +220,24 @@
     return this;
   };
 
-  Bytecode.prototype.push = function($value) {
-    this._vals.push($value);
-    return $value;
+  Bytecode.prototype.push = function() {
+    this._vals.push(null);
   };
 
   Bytecode.prototype.shift = function() {
     if (this._vals.length) {
       return this._vals.shift();
-    } else {
-      return this._parent.shift();
     }
+    return this._parent.shift();
+  };
+
+  Bytecode.prototype.update = function($value) {
+    if (this._vals.length) {
+      this._vals[this._vals.length - 1] = $value;
+    } else if (this._parent) {
+      this._parent.update($value);
+    }
+    return $value;
   };
 
   Bytecode.prototype.break = function() {