Merge pull request #73 from mohayonao/minor-fixes

- minor fixes
mohayonao · Jun 16, 2014 · ebcc7e5 · ebcc7e5
2 parents 7c2b59d + 8163b35
commit ebcc7e5
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 231 deletions.
diff --git a/src/sc/classlib/Collections/ArrayedCollection.js b/src/sc/classlib/Collections/ArrayedCollection.js
@@ -6,11 +6,12 @@ SCScript.install(function(sc) {
   var slice = [].slice;
   var $  = sc.lang.$;
   var fn = sc.lang.fn;
+  var klass    = sc.lang.klass;
   var iterator = sc.lang.iterator;
   var rand     = sc.libs.random;
   var mathlib  = sc.libs.mathlib;
 
-  sc.lang.klass.refine("ArrayedCollection", function(spec, utils) {
+  klass.refine("ArrayedCollection", function(spec, utils) {
     var $nil   = utils.$nil;
     var $int_0 = utils.$int_0;
     var $int_1 = utils.$int_1;
@@ -785,7 +786,7 @@ SCScript.install(function(sc) {
     };
   });
 
-  sc.lang.klass.refine("RawArray", function(spec, utils) {
+  klass.refine("RawArray", function(spec, utils) {
     var SCArray = $("Array");
 
     spec.archiveAsCompileString = utils.alwaysReturn$true;
@@ -802,7 +803,7 @@ SCScript.install(function(sc) {
     };
   });
 
-  sc.lang.klass.define("Int8Array : RawArray", function(spec) {
+  klass.define("Int8Array : RawArray", function(spec) {
     var int8 = new Int8Array(1);
 
     spec.constructor = function SCInt8Array() {
@@ -821,7 +822,7 @@ SCScript.install(function(sc) {
     };
   });
 
-  sc.lang.klass.define("Int16Array : RawArray", function(spec) {
+  klass.define("Int16Array : RawArray", function(spec) {
     var int16 = new Int16Array(1);
 
     spec.constructor = function SCInt16Array() {
@@ -840,7 +841,7 @@ SCScript.install(function(sc) {
     };
   });
 
-  sc.lang.klass.define("Int32Array : RawArray", function(spec) {
+  klass.define("Int32Array : RawArray", function(spec) {
     var int32 = new Int32Array(1);
 
     spec.constructor = function SCInt32Array() {
@@ -859,7 +860,7 @@ SCScript.install(function(sc) {
     };
   });
 
-  sc.lang.klass.define("FloatArray : RawArray", function(spec) {
+  klass.define("FloatArray : RawArray", function(spec) {
     var float32 = new Float32Array(1);
 
     spec.constructor = function SCFloatArray() {
@@ -878,7 +879,7 @@ SCScript.install(function(sc) {
     };
   });
 
-  sc.lang.klass.define("DoubleArray : RawArray", function(spec) {
+  klass.define("DoubleArray : RawArray", function(spec) {
     var float64 = new Float64Array(1);
 
     spec.constructor = function SCDoubleArray() {

diff --git a/src/sc/classlib/Collections/Association.js b/src/sc/classlib/Collections/Association.js
@@ -4,35 +4,18 @@ SCScript.install(function(sc) {
   require("../Math/Magnitude");
 
   sc.lang.klass.define("Association : Magnitude", function(spec, utils) {
-    var $nil   = utils.$nil;
     var $false = utils.$false;
 
     spec.constructor = function SCAssociation() {
       this.__super__("Magnitude");
     };
+    utils.setProperty(spec, "<>", "key");
+    utils.setProperty(spec, "<>", "value");
 
     spec.valueOf = function() {
       return this._$key.valueOf();
     };
 
-    spec.key = function() {
-      return this._$key;
-    };
-
-    spec.key_ = function($value) {
-      this._$key = $value || /* istanbul ignore next */ $nil;
-      return this;
-    };
-
-    spec.value = function() {
-      return this._$value;
-    };
-
-    spec.value_ = function($value) {
-      this._$value = $value || /* istanbul ignore next */ $nil;
-      return this;
-    };
-
     spec.$new = function($key, $value) {
       return this._newCopyArgs({
         key: $key,

diff --git a/src/sc/classlib/Collections/Association_test.js b/src/sc/classlib/Collections/Association_test.js
@@ -23,34 +23,6 @@
       test = instance.valueOf();
       expect(test).to.be.a("JSNumber").that.equals(1);
     });
-    it("<>value", function() {
-      var instance, test;
-      var $value;
-
-      $value = $$();
-
-      instance = this.createInstance();
-
-      test = instance.value_($value);
-      expect(test).to.equal(instance);
-
-      test = instance.value();
-      expect(test).to.equal($value);
-    });
-    it("<>key", function() {
-      var instance, test;
-      var $key;
-
-      $key = $$();
-
-      instance = this.createInstance();
-
-      test = instance.key_($key);
-      expect(test).to.equal(instance);
-
-      test = instance.key();
-      expect(test).to.equal($key);
-    });
     it("#==", function() {
       var instance, test;
       var $anAssociation;

diff --git a/src/sc/classlib/Collections/Dictionary.js b/src/sc/classlib/Collections/Dictionary.js
@@ -594,38 +594,15 @@ SCScript.install(function(sc) {
   sc.lang.klass.refine("IdentityDictionary", function(spec, utils) {
     var $nil = utils.$nil;
 
+    utils.setProperty(spec, "<>", "proto");
+    utils.setProperty(spec, "<>", "parent");
+    utils.setProperty(spec, "<>", "know");
+
     spec.$new = fn(function($n, $proto, $parent, $know) {
       return this.__super__("new", [ $n ])
         .proto_($proto).parent_($parent).know_($know);
     }, "n=8; proto; parent; know=false");
 
-    spec.proto = function() {
-      return this._$proto;
-    };
-
-    spec.proto_ = function($value) {
-      this._$proto = $value || /* istanbul ignore next */ $nil;
-      return this;
-    };
-
-    spec.parent = function() {
-      return this._$parent;
-    };
-
-    spec.parent_ = function($value) {
-      this._$parent = $value || /* istanbul ignore next */ $nil;
-      return this;
-    };
-
-    spec.know = function() {
-      return this._$know;
-    };
-
-    spec.know_ = function($value) {
-      this._$know = $value || /* istanbul ignore next */ $nil;
-      return this;
-    };
-
     spec.putGet = fn(function($key, $value) {
       var $array, $index, $prev;
 

diff --git a/src/sc/classlib/Collections/Dictionary_test.js b/src/sc/classlib/Collections/Dictionary_test.js
@@ -579,51 +579,6 @@
       test = instance.valueOf();
       expect(test).to.be.a("JSObject").that.eqls({});
     });
-    it("<>proto", function() {
-      var instance, test;
-      var $value;
-
-      $value = $$();
-
-      instance = this.createInstance();
-
-      test = instance.proto_($value);
-      expect(test).to.equal(instance);
-
-      test = instance.proto();
-      expect(test).to.equal($value);
-    });
-    it("<>parent", function() {
-      var instance, test;
-      var $value;
-
-      $value = $$();
-
-      instance = this.createInstance();
-
-      test = instance.parent_($value);
-      expect(test).to.equal(instance);
-
-      test = instance.parent();
-      expect(test).to.equal($value);
-    });
-    it("<>know", function() {
-      var instance, test;
-      var $value;
-
-      $value = $$();
-
-      instance = this.createInstance();
-
-      test = instance.know();
-      expect(test).to.be.a("SCBoolean").that.is.false;
-
-      test = instance.know_($value);
-      expect(test).to.equal(instance);
-
-      test = instance.know();
-      expect(test).to.equal($value);
-    });
     it("#at", function() {
       testCase(this, [
         {

diff --git a/src/sc/classlib/Collections/Set.js b/src/sc/classlib/Collections/Set.js
@@ -12,6 +12,8 @@ SCScript.install(function(sc) {
     var $int_0 = utils.$int_0;
     var SCArray = $("Array");
 
+    utils.setProperty(spec, "<>", "array");
+
     spec.$new = fn(function($n) {
       $n = $.Integer(Math.max($n.__int__(), 2) * 2);
       return this.__super__("new").initSet($n);
@@ -25,15 +27,6 @@ SCScript.install(function(sc) {
       });
     };
 
-    spec.array = function() {
-      return this._$array;
-    };
-
-    spec.array_ = function($value) {
-      this._$array = $value || /* istanbul ignore next */ $nil;
-      return this;
-    };
-
     spec.size = function() {
       return $.Integer(this._size);
     };

diff --git a/src/sc/classlib/Collections/Set_test.js b/src/sc/classlib/Collections/Set_test.js
@@ -25,20 +25,6 @@
       test = instance.valueOf();
       expect(test).to.eql([]);
     });
-    it("<>array", function() {
-      var instance, test;
-      var $value;
-
-      $value = $$();
-
-      instance = this.createInstance();
-
-      test = instance.array_($value);
-      expect(test).to.equal(instance);
-
-      test = instance.array();
-      expect(test).to.equal($value);
-    });
     it("<size", function() {
       var instance, test;
 

diff --git a/src/sc/classlib/Core/AbstractFunction.js b/src/sc/classlib/Core/AbstractFunction.js
@@ -5,8 +5,9 @@ SCScript.install(function(sc) {
 
   var $  = sc.lang.$;
   var fn = sc.lang.fn;
+  var klass = sc.lang.klass;
 
-  sc.lang.klass.refine("AbstractFunction", function(spec, utils) {
+  klass.refine("AbstractFunction", function(spec, utils) {
     spec.composeUnaryOp = function($aSelector) {
       return $("UnaryOpFunction").new($aSelector, this);
     };
@@ -608,7 +609,7 @@ SCScript.install(function(sc) {
     spec.isValidUGenInput = utils.alwaysReturn$true;
   });
 
-  sc.lang.klass.define("UnaryOpFunction : AbstractFunction", function(spec) {
+  klass.define("UnaryOpFunction : AbstractFunction", function(spec) {
     spec.constructor = function SCUnaryOpFunction() {
       this.__super__("AbstractFunction");
     };
@@ -645,7 +646,7 @@ SCScript.install(function(sc) {
     // TODO: implements storeOn
   });
 
-  sc.lang.klass.define("BinaryOpFunction : AbstractFunction", function(spec) {
+  klass.define("BinaryOpFunction : AbstractFunction", function(spec) {
     spec.constructor = function SCBinaryOpFunction() {
       this.__super__("AbstractFunction");
     };
@@ -679,7 +680,7 @@ SCScript.install(function(sc) {
     // TODO: implements storeOn
   });
 
-  sc.lang.klass.define("NAryOpFunction : AbstractFunction", function(spec) {
+  klass.define("NAryOpFunction : AbstractFunction", function(spec) {
     spec.constructor = function SCNAryOpFunction() {
       this.__super__("AbstractFunction");
     };
@@ -721,29 +722,21 @@ SCScript.install(function(sc) {
     // TODO: implements storeOn
   });
 
-  sc.lang.klass.define("FunctionList : AbstractFunction", function(spec, utils) {
+  klass.define("FunctionList : AbstractFunction", function(spec, utils) {
     var $int_0 = utils.$int_0;
 
     spec.constructor = function SCFunctionList() {
       this.__super__("AbstractFunction");
       this._flopped = false;
     };
+    utils.setProperty(spec, "<>", "array");
 
     spec.$new = function($functions) {
       return this._newCopyArgs({
         array: $functions
       });
     };
 
-    spec.array = function() {
-      return this._$array;
-    };
-
-    spec.array_ = fn(function($value) {
-      this._$array = $value;
-      return this;
-    }, "value");
-
     spec.flopped = function() {
       return $.Boolean(this._flopped);
     };

diff --git a/src/sc/classlib/Core/Ref.js b/src/sc/classlib/Core/Ref.js
@@ -6,6 +6,8 @@ SCScript.install(function(sc) {
   var fn = sc.lang.fn;
 
   sc.lang.klass.refine("Ref", function(spec, utils) {
+    utils.setProperty(spec, "<>", "value");
+
     spec.$new = function($thing) {
       return this.__super__("new").value_($thing);
     };
@@ -14,15 +16,6 @@ SCScript.install(function(sc) {
       return this._$value.valueOf();
     };
 
-    spec.value = function() {
-      return this._$value;
-    };
-
-    spec.value_ = fn(function($value) {
-      this._$value = $value;
-      return this;
-    }, "value");
-
     // $new
 
     spec.set = fn(function($thing) {