Refactor maths functions to be in the maths library

adventofcode/advent01-1.mc

@@ -1,12 +1,12 @@
 ; Requires the input for Advent of Code(http://adventofcode.com/) Day 1
-(include str fs)
+(include str fs maths)
 (assign input (fs::readIn "advent.txt"))
 (assign i 0)
 (assign result 0)
 (repeat (str::length input)
   (assign current (str::charAtIndex input i))
-  (if (eq current "(") (assign result (add result 1)))
-  (if (eq current ")") (assign result (subtract result 1)))
-  (assign i (add i 1))
+  (if (eq current "(") (assign result (maths::add result 1)))
+  (if (eq current ")") (assign result (maths::subtract result 1)))
+  (assign i (maths::add i 1))
 )
 (log result)

adventofcode/advent02-1.mc

@@ -10,10 +10,10 @@
 (repeat (str::length input)
   (assign current (str::charAtIndex input i))
   (if (eq current "x") 
-    (assign currNum (add currNum 1)) |
+    (assign currNum (maths::add currNum 1)) |
     (if (eq current "\n") 
       (assign currNum 1) 
-      (assign result (add result (add (add (multiply 2 (multiply resultone resulttwo)) (add (multiply 2 (multiply resulttwo resultthree)) (multiply 2 (multiply resultone resultthree)))) (maths::min (multiply resultone resulttwo) (multiply resulttwo resultthree) (multiply resultthree resultone)))))
+      (assign result (maths::add result (maths::add (maths::add (maths::multiply 2 (maths::multiply resultone resulttwo)) (maths::add (maths::multiply 2 (maths::multiply resulttwo resultthree)) (maths::multiply 2 (maths::multiply resultone resultthree)))) (maths::min (maths::multiply resultone resulttwo) (maths::multiply resulttwo resultthree) (maths::multiply resultthree resultone)))))
       (assign resultone "")
       (assign resulttwo "")
       (assign resultthree "") | 
@@ -22,6 +22,6 @@
         (if (eq currNum 3) (assign resultthree (str::concat resultthree current)))
     )
   )
-  (assign i (add i 1))
+  (assign i (maths::add i 1))
 )
 (log result)

examples/examples.mc

@@ -1,7 +1,7 @@
 ; This is a test program
-(include str)
+(include str maths)
 (assign twelve 12) ; This assigns the variable twelve, to the number literal 12
-(assign myvar (add twelve (subtract 6 2))) ; This assigns the variable myvar, to the result of adding the variable twelve to the result of subtracting 2 from 6
+(assign myvar (maths::add twelve (maths::subtract 6 2))) ; This assigns the variable myvar, to the result of adding the variable twelve to the result of subtracting 2 from 6
 (log myvar) ; This logs the value of myvar
 (log 6) ; This logs the number literal 6
 (assign twelve myvar) ; This reassigns the variable twelve to the value of the variable myvar
@@ -12,7 +12,7 @@
   (log twelve) 
   (log 6) 
   (log 6) 
-  (assign scopelol (add twelve 5)) 
+  (assign scopelol (maths::add twelve 5)) 
   (log scopelol)
 )
 (def argTest (log $1) (log $2)) ; Functions take an unlimited number of arguments that can be referred to by $n

examples/fizzbuzz.mc

@@ -1,13 +1,13 @@
-(include str)
+(include str maths)
 (def fizzbuzz
   (assign i 1)
   (repeat $1
     (assign result "")
-    (if (eq (modulo i 3) 0) (assign result (str::concat result "Fizz")))
-    (if (eq (modulo i 5) 0) (assign result (str::concat result "Buzz")))
+    (if (eq (maths::modulo i 3) 0) (assign result (str::concat result "Fizz")))
+    (if (eq (maths::modulo i 5) 0) (assign result (str::concat result "Buzz")))
     (if (eq result "") (assign result i))
     (log result)
-    (assign i (add i 1))
+    (assign i (maths::add i 1))
   )
 1)
 

libjs/maths.js

@@ -6,6 +6,26 @@ const builtins = {
     return {
       value: Math.min.apply(null, argArr.map((arg) => arg.value))
     }
+  },
+  add: function (arg1, arg2) {
+    return {
+      value: (arg1.value + arg2.value)
+    }
+  },
+  subtract: function (arg1, arg2) {
+    return {
+      value: (arg1.value - arg2.value)
+    }
+  },
+  multiply: function (arg1, arg2) {
+    return {
+      value: (arg1.value * arg2.value)
+    }
+  },
+  modulo: function (arg1, arg2) {
+    return {
+      value: (arg1.value % arg2.value)
+    }
   }
 }
 

libjs/stdlib.js

@@ -9,18 +9,8 @@ const builtins = {
     }
     global_obj[ref.name] = value.value
   },
-  add: function (arg1, arg2) {
-    return {
-      value: (arg1.value + arg2.value)
-    }
-  },
-  subtract: function (arg1, arg2) {
-    return {
-      value: (arg1.value - arg2.value)
-    }
-  },
   log: function (ref) {
-    console.log(JSON.stringify(ref.value))
+    console.log(ref.value)
   },
   ref: function (refname) {
     return {
@@ -68,16 +58,6 @@ const builtins = {
   neg: function (pred) {
     return !pred
   },
-  modulo: function (arg1, arg2) {
-    return {
-      value: (arg1.value % arg2.value)
-    }
-  },
-  multiply: function (arg1, arg2) {
-    return {
-      value: (arg1.value * arg2.value)
-    }
-  }
 }