kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

arithmetic assignment

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-01-04 13:02:50 -07:00
parent 3e81f23028
commit 0c3427cf84
3 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kiss/src/kiss/Macros.hx
View File

@@ -19,6 +19,13 @@ class Macros {
public static function builtins() { public static function builtins() {
var macros:Map<String, MacroFunction> = []; var macros:Map<String, MacroFunction> = [];
function destructiveVersion(op:String, assignOp:String) {
macros[assignOp] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k) -> {
wholeExp.checkNumArgs(2, null, '($assignOp [var] [v1] [values...])');
CallExp(Symbol("set").withPosOf(wholeExp), [exps[0], CallExp(Symbol(op).withPosOf(wholeExp), exps).withPosOf(wholeExp)]).withPosOf(wholeExp);
};
}
macros["%"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k) -> { macros["%"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k) -> {
wholeExp.checkNumArgs(2, 2, '(% [divisor] [dividend])'); wholeExp.checkNumArgs(2, 2, '(% [divisor] [dividend])');
CallExp(Symbol("kiss.Operand.toDynamic").withPosOf(wholeExp), [ CallExp(Symbol("kiss.Operand.toDynamic").withPosOf(wholeExp), [
@@ -28,6 +35,7 @@ class Macros {
]).withPosOf(wholeExp) ]).withPosOf(wholeExp)
]).withPosOf(wholeExp); ]).withPosOf(wholeExp);
}; };
destructiveVersion("%", "%=");
macros["^"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k) -> { macros["^"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k) -> {
wholeExp.checkNumArgs(2, 2, '(^ [base] [exponent])'); wholeExp.checkNumArgs(2, 2, '(^ [base] [exponent])');
@@ -38,14 +46,19 @@ class Macros {
]).withPosOf(wholeExp) ]).withPosOf(wholeExp)
]).withPosOf(wholeExp); ]).withPosOf(wholeExp);
}; };
destructiveVersion("^", "^=");
macros["+"] = variadicMacro("Prelude.add"); macros["+"] = variadicMacro("Prelude.add");
destructiveVersion("+", "+=");
macros["-"] = variadicMacro("Prelude.subtract"); macros["-"] = variadicMacro("Prelude.subtract");
destructiveVersion("-", "-=");
macros["*"] = variadicMacro("Prelude.multiply"); macros["*"] = variadicMacro("Prelude.multiply");
destructiveVersion("*", "*=");
macros["/"] = variadicMacro("Prelude.divide"); macros["/"] = variadicMacro("Prelude.divide");
destructiveVersion("/", "/=");
macros["min"] = variadicMacro("Prelude.min"); macros["min"] = variadicMacro("Prelude.min");
macros["max"] = variadicMacro("Prelude.max"); macros["max"] = variadicMacro("Prelude.max");

4
kiss/src/test/cases/BasicTestCase.hx
View File

@@ -265,6 +265,10 @@ class BasicTestCase extends Test {
function testLoadedFunction() { function testLoadedFunction() {
Assert.equals("loaded", BasicTestCase.loadedFunction()); Assert.equals("loaded", BasicTestCase.loadedFunction());
} }
function testAssignArith() {
_testAssignArith();
}
} }
class BasicObject { class BasicObject {

15
kiss/src/test/cases/BasicTestCase.kiss
View File

@@ -422,3 +422,18 @@
(defun _testCallAlias [] (defun _testCallAlias []
(let [map [=>"hey" "you"]] (let [map [=>"hey" "you"]]
(Assert.equals "you" (dictGet map "hey")))) (Assert.equals "you" (dictGet map "hey"))))
(defun _testAssignArith []
(deflocal &mut num 5)
(+= num 5 6)
(Assert.equals 16 num)
(%= num 5)
(Assert.equals 1 num)
(^= num 3)
(Assert.equals 1 num)
(*= num 25 2)
(Assert.equals 50 num)
(/= num 25 2)
(Assert.equals 1 num)
(-= num 5 6)
(Assert.equals -10 num))