-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19 from mohayonao/code-cleanup
code cleanup
- Loading branch information
Showing
7 changed files
with
136 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,13 @@ | ||
| require("./klass"); | ||
| require("./dollarSC"); | ||
| require("./iterator"); | ||
| require("./fn"); | ||
| require("../libs/random"); | ||
| require("../libs/mathlib"); | ||
| (function(sc) { | ||
| "use strict"; | ||
|
|
||
| require("./klass"); | ||
| require("./dollarSC"); | ||
| require("./iterator"); | ||
| require("./fn"); | ||
| require("../libs/random"); | ||
| require("../libs/mathlib"); | ||
|
|
||
| sc.lang.classlib = {}; | ||
|
|
||
| })(sc); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| (function(sc) { | ||
| "use strict"; | ||
|
|
||
| require("../../classlib"); | ||
|
|
||
| var $SC = sc.lang.$SC; | ||
| var mathlib = sc.libs.mathlib; | ||
|
|
||
| sc.lang.classlib.bop = function(selector, type1, type2) { | ||
| var func = mathlib[selector]; | ||
|
|
||
| return function($aNumber, $adverb) { | ||
| var tag = $aNumber.__tag; | ||
|
|
||
| switch (tag) { | ||
| case sc.C.TAG_INT: | ||
| return type1(func(this._, $aNumber._)); | ||
| case sc.C.TAG_FLOAT: | ||
| return type2(func(this._, $aNumber._)); | ||
| } | ||
|
|
||
| return $aNumber.performBinaryOpOnSimpleNumber( | ||
| $SC.Symbol(selector), this, $adverb | ||
| ); | ||
| }; | ||
| }; | ||
|
|
||
| })(sc); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| "use strict"; | ||
|
|
||
| require("./bop"); | ||
| require("../../../libs/mathlib"); | ||
|
|
||
| describe("sc.lang.classlib.bop", function() { | ||
| var $SC = sc.lang.$SC; | ||
| var bop = sc.lang.classlib.bop; | ||
| it("(int, int)", function() { | ||
| var func, test; | ||
|
|
||
| func = bop("+", $SC.Integer, $SC.Integer); | ||
|
|
||
| test = func.call($SC.Integer(1), $SC.Integer(2)); | ||
| expect(test).to.be.a("SCInteger").that.equals(3); | ||
|
|
||
| test = func.call($SC.Integer(1), $SC.Float(2)); | ||
| expect(test).to.be.a("SCInteger").that.equals(3); | ||
|
|
||
| test = func.call($SC.Float(1), $SC.Integer(2)); | ||
| expect(test).to.be.a("SCInteger").that.equals(3); | ||
|
|
||
| test = func.call($SC.Float(1), $SC.Float(2)); | ||
| expect(test).to.be.a("SCInteger").that.equals(3); | ||
| }); | ||
| it("(int, float)", function() { | ||
| var func, test; | ||
|
|
||
| func = bop("+", $SC.Integer, $SC.Float); | ||
|
|
||
| test = func.call($SC.Integer(1), $SC.Integer(2)); | ||
| expect(test).to.be.a("SCInteger").that.equals(3); | ||
|
|
||
| test = func.call($SC.Integer(1), $SC.Float(2)); | ||
| expect(test).to.be.a("SCFloat").that.equals(3); | ||
|
|
||
| test = func.call($SC.Float(1), $SC.Integer(2)); | ||
| expect(test).to.be.a("SCInteger").that.equals(3); | ||
|
|
||
| test = func.call($SC.Float(1), $SC.Float(2)); | ||
| expect(test).to.be.a("SCFloat").that.equals(3); | ||
| }); | ||
| it("(float, float)", function() { | ||
| var func, test; | ||
|
|
||
| func = bop("+", $SC.Float, $SC.Float); | ||
|
|
||
| test = func.call($SC.Integer(1), $SC.Integer(2)); | ||
| expect(test).to.be.a("SCFloat").that.equals(3); | ||
|
|
||
| test = func.call($SC.Integer(1), $SC.Float(2)); | ||
| expect(test).to.be.a("SCFloat").that.equals(3); | ||
|
|
||
| test = func.call($SC.Float(1), $SC.Integer(2)); | ||
| expect(test).to.be.a("SCFloat").that.equals(3); | ||
|
|
||
| test = func.call($SC.Float(1), $SC.Float(2)); | ||
| expect(test).to.be.a("SCFloat").that.equals(3); | ||
| }); | ||
| it("(others)", function() { | ||
| var func, test; | ||
|
|
||
| func = bop("+", $SC.Float, $SC.Float); | ||
|
|
||
| test = func.call($SC.Integer(1), $SC.Array([ $SC.Integer(2) ])); | ||
| expect(test).to.be.a("SCArray").that.eqls([ 3 ]); | ||
| }); | ||
| }); |