diff options
| author | Eduardo Julian | 2017-03-22 18:54:07 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2017-03-22 18:54:07 -0400 |
| commit | bc17742ca0cc3483353e2c76e25496c1b105d8ed (patch) | |
| tree | 746ae19b2f0eb7ab34a294cb31a081eca980f2e7 | |
| parent | 749608e2f4f9804f33812b194297201851343947 (diff) | |
- LuxRT functions/constants now live in the top-level namespace, instead of inside a LuxRT object.
Diffstat (limited to '')
| -rw-r--r-- | luxc/src/lux/compiler/js/lux.clj | 16 | ||||
| -rw-r--r-- | luxc/src/lux/compiler/js/proc/common.clj | 117 | ||||
| -rw-r--r-- | luxc/src/lux/compiler/js/proc/host.clj | 6 | ||||
| -rw-r--r-- | luxc/src/lux/compiler/js/rt.clj | 564 |
4 files changed, 321 insertions, 382 deletions
diff --git a/luxc/src/lux/compiler/js/lux.clj b/luxc/src/lux/compiler/js/lux.clj index ffb75a3ef..bf188803c 100644 --- a/luxc/src/lux/compiler/js/lux.clj +++ b/luxc/src/lux/compiler/js/lux.clj @@ -35,7 +35,7 @@ (defn <name> [value] (let [high (-> value (bit-shift-right 32) int) low (-> value (bit-and mask-4b) (bit-shift-left 32) (bit-shift-right 32) int)] - (return (str &&rt/LuxRT "." "makeI64" "(" high "," low ")")))) + (return (str "LuxRT$makeI64" "(" high "," low ")")))) compile-nat compile-int @@ -134,7 +134,7 @@ (return (&/fold (fn [source step] (|let [[idx tail?] step method (if tail? "product_getRight" "product_getLeft")] - (str &&rt/LuxRT "." method "(" source "," idx ")"))) + (str "LuxRT$" method "(" source "," idx ")"))) (str "(" =value ")") _path)))) @@ -179,15 +179,15 @@ (&o/$NatPM _value) (|do [=value (compile-nat _value)] - (return (str "if(!" (str "LuxRT.eqI64(" cursor-peek "," =value ")") ") { " pm-fail " }"))) + (return (str "if(!" (str "LuxRT$eqI64(" cursor-peek "," =value ")") ") { " pm-fail " }"))) (&o/$IntPM _value) (|do [=value (compile-int _value)] - (return (str "if(!" (str "LuxRT.eqI64(" cursor-peek "," =value ")") ") { " pm-fail " }"))) + (return (str "if(!" (str "LuxRT$eqI64(" cursor-peek "," =value ")") ") { " pm-fail " }"))) (&o/$DegPM _value) (|do [=value (compile-deg _value)] - (return (str "if(!" (str "LuxRT.eqI64(" cursor-peek "," =value ")") ") { " pm-fail " }"))) + (return (str "if(!" (str "LuxRT$eqI64(" cursor-peek "," =value ")") ") { " pm-fail " }"))) (&o/$RealPM _value) (return (str "if(" cursor-peek " !== " _value ") { " pm-fail " }")) @@ -208,7 +208,7 @@ (&/$Right _idx) (&/T [_idx true])) getter (if is-tail? "product_getRight" "product_getLeft")] - (return (str (cursor-push (str &&rt/LuxRT "." getter "(" cursor-peek "," _idx ")"))))) + (return (str (cursor-push (str "LuxRT$" getter "(" cursor-peek "," _idx ")"))))) (&o/$VariantPM _idx+) (|let [[_idx is-last] (|case _idx+ @@ -217,7 +217,7 @@ (&/$Right _idx) (&/T [_idx true])) - temp-assignment (str "temp = " &&rt/LuxRT "." "sum_get(" cursor-peek "," _idx "," (if is-last "\"\"" "null") ");")] + temp-assignment (str "temp = LuxRT$sum_get(" cursor-peek "," _idx "," (if is-last "\"\"" "null") ");")] (return (str temp-assignment (str "if(temp !== null) {" (cursor-push "temp") @@ -382,7 +382,7 @@ (defn compile-program [compile ?body] (|do [=body (compile ?body) - :let [program-js (str (str "var " (register-name 0) " = LuxRT.programArgs();") + :let [program-js (str (str "var " (register-name 0) " = LuxRT$programArgs();") (str "(" =body ")(null);"))] eval? &/get-eval ^StringBuilder buffer &&/get-buffer diff --git a/luxc/src/lux/compiler/js/proc/common.clj b/luxc/src/lux/compiler/js/proc/common.clj index c7e741e01..907b6d512 100644 --- a/luxc/src/lux/compiler/js/proc/common.clj +++ b/luxc/src/lux/compiler/js/proc/common.clj @@ -19,7 +19,7 @@ (|do [:let [(&/$Cons ?input (&/$Cons ?param (&/$Nil))) ?values] =input (compile ?input) =param (compile ?param)] - (return (str "LuxRT." <op> "(" =input "," =param ")")))) + (return (str "LuxRT$" <op> "(" =input "," =param ")")))) ^:private compile-bit-and "andI64" ^:private compile-bit-or "orI64" @@ -31,7 +31,7 @@ (|do [:let [(&/$Cons ?input (&/$Cons ?param (&/$Nil))) ?values] =input (compile ?input) =param (compile ?param)] - (return (str "LuxRT." <op> "(" =input "," =param ".L)")))) + (return (str "LuxRT$" <op> "(" =input "," =param ".L)")))) ^:private compile-bit-shift-left "shlI64" ^:private compile-bit-shift-right "shrI64" @@ -41,7 +41,7 @@ (defn ^:private compile-bit-count [compile ?values special-args] (|do [:let [(&/$Cons ?input (&/$Nil)) ?values] =input (compile ?input)] - (return (str "LuxRT.countI64(" =input ")")))) + (return (str "LuxRT$countI64(" =input ")")))) (defn ^:private compile-lux-is [compile ?values special-args] (|do [:let [(&/$Cons ?left (&/$Cons ?right (&/$Nil))) ?values] @@ -52,12 +52,12 @@ (defn ^:private compile-lux-try [compile ?values special-args] (|do [:let [(&/$Cons ?op (&/$Nil)) ?values] =op (compile ?op)] - (return (str "LuxRT.runTry(" =op ")")))) + (return (str "LuxRT$runTry(" =op ")")))) (defn ^:private compile-array-new [compile ?values special-args] (|do [:let [(&/$Cons ?length (&/$Nil)) ?values] =length (compile ?length)] - (return (str "new Array(" (str "LuxRT.toNumberI64(" =length ")") ")")))) + (return (str "new Array(" (str "LuxRT$toNumberI64(" =length ")") ")")))) (defn ^:private compile-array-get [compile ?values special-args] (|do [:let [(&/$Cons ?array (&/$Cons ?idx (&/$Nil))) ?values @@ -65,7 +65,7 @@ ] =array (compile ?array) =idx (compile ?idx)] - (return (str "LuxRT.arrayGet(" =array "," =idx ")")))) + (return (str "LuxRT$arrayGet(" =array "," =idx ")")))) (defn ^:private compile-array-put [compile ?values special-args] (|do [:let [(&/$Cons ?array (&/$Cons ?idx (&/$Cons ?elem (&/$Nil)))) ?values @@ -74,7 +74,7 @@ =array (compile ?array) =idx (compile ?idx) =elem (compile ?elem)] - (return (str "LuxRT.arrayPut(" =array "," =idx "," =elem ")")))) + (return (str "LuxRT$arrayPut(" =array "," =idx "," =elem ")")))) (defn ^:private compile-array-remove [compile ?values special-args] (|do [:let [(&/$Cons ?array (&/$Cons ?idx (&/$Nil))) ?values @@ -82,21 +82,21 @@ ] =array (compile ?array) =idx (compile ?idx)] - (return (str "LuxRT.arrayRemove(" =array "," =idx ")")))) + (return (str "LuxRT$arrayRemove(" =array "," =idx ")")))) (defn ^:private compile-array-size [compile ?values special-args] (|do [:let [(&/$Cons ?array (&/$Nil)) ?values ;; (&/$Nil) special-args ] =array (compile ?array)] - (return (str "LuxRT.fromNumberI64(" =array ".length" ")")))) + (return (str "LuxRT$fromNumberI64(" =array ".length" ")")))) (do-template [<name> <method>] (defn <name> [compile ?values special-args] (|do [:let [(&/$Cons ?x (&/$Cons ?y (&/$Nil))) ?values] =x (compile ?x) =y (compile ?y)] - (return (str &&rt/LuxRT "." <method> "(" =x "," =y ")")))) + (return (str "LuxRT$" <method> "(" =x "," =y ")")))) ^:private compile-nat-add "addI64" ^:private compile-nat-sub "subI64" @@ -144,7 +144,7 @@ (defn <name> [compile ?values special-args] (|do [:let [(&/$Cons ?x (&/$Nil)) ?values] =x (compile ?x)] - (return (str &&rt/LuxRT "." <method> "(" =x ")")) + (return (str "LuxRT$" <method> "(" =x ")")) )) ^:private compile-int-encode "encodeI64" @@ -161,7 +161,7 @@ (defn ^:private compile-real-hash [compile ?values special-args] (|do [:let [(&/$Cons ?x (&/$Nil)) ?values] =x (compile ?x)] - (return (str &&rt/LuxRT ".textHash(''+" =x ")")) + (return (str "LuxRT$textHash(''+" =x ")")) )) (do-template [<name> <compiler> <value>] @@ -191,63 +191,6 @@ =x (compile ?x)] (return (str "(" =x ")" ".toString()")))) -;; (defn ^:private compile-nat-lt [compile ?values special-args] -;; (|do [:let [(&/$Cons ?x (&/$Cons ?y (&/$Nil))) ?values] -;; ^MethodVisitor *writer* &/get-writer -;; _ (compile ?x) -;; :let [_ (doto *writer* -;; &&/unwrap-long)] -;; _ (compile ?y) -;; :let [_ (doto *writer* -;; &&/unwrap-long) -;; $then (new Label) -;; $end (new Label) -;; _ (doto *writer* -;; (.visitMethodInsn Opcodes/INVOKESTATIC "lux/LuxRT" "_compareUnsigned" "(JJ)I") -;; (.visitLdcInsn (int -1)) -;; (.visitJumpInsn Opcodes/IF_ICMPEQ $then) -;; (.visitFieldInsn Opcodes/GETSTATIC (&host-generics/->bytecode-class-name "java.lang.Boolean") "FALSE" (&host-generics/->type-signature "java.lang.Boolean")) -;; (.visitJumpInsn Opcodes/GOTO $end) -;; (.visitLabel $then) -;; (.visitFieldInsn Opcodes/GETSTATIC (&host-generics/->bytecode-class-name "java.lang.Boolean") "TRUE" (&host-generics/->type-signature "java.lang.Boolean")) -;; (.visitLabel $end))]] -;; (return nil))) - -;; (do-template [<name> <method>] -;; (defn <name> [compile ?values special-args] -;; (|do [:let [(&/$Cons ?x (&/$Cons ?y (&/$Nil))) ?values] -;; ^MethodVisitor *writer* &/get-writer -;; _ (compile ?x) -;; :let [_ (doto *writer* -;; &&/unwrap-long)] -;; _ (compile ?y) -;; :let [_ (doto *writer* -;; &&/unwrap-long)] -;; :let [_ (doto *writer* -;; (.visitMethodInsn Opcodes/INVOKESTATIC "lux/LuxRT" <method> "(JJ)J") -;; &&/wrap-long)]] -;; (return nil))) - -;; ^:private compile-deg-mul "mul_deg" -;; ^:private compile-deg-div "div_deg" -;; ) - -;; (do-template [<name> <class> <method> <sig> <unwrap> <wrap>] -;; (let [+wrapper-class+ (&host-generics/->bytecode-class-name <class>)] -;; (defn <name> [compile ?values special-args] -;; (|do [:let [(&/$Cons ?x (&/$Nil)) ?values] -;; ^MethodVisitor *writer* &/get-writer -;; _ (compile ?x) -;; :let [_ (doto *writer* -;; <unwrap> -;; (.visitMethodInsn Opcodes/INVOKESTATIC "lux/LuxRT" <method> <sig>) -;; <wrap>)]] -;; (return nil)))) - -;; ^:private compile-deg-to-real "java.lang.Long" "deg-to-real" "(J)D" &&/unwrap-long &&/wrap-double -;; ^:private compile-real-to-deg "java.lang.Double" "real-to-deg" "(D)J" &&/unwrap-double &&/wrap-long -;; ) - (do-template [<name>] (defn <name> [compile ?values special-args] (|do [:let [(&/$Cons ?x (&/$Nil)) ?values]] @@ -260,22 +203,22 @@ (defn ^:private compile-int-to-real [compile ?values special-args] (|do [:let [(&/$Cons ?x (&/$Nil)) ?values] =x (compile ?x)] - (return (str "LuxRT.toNumberI64(" =x ")")))) + (return (str "LuxRT$toNumberI64(" =x ")")))) (defn ^:private compile-real-to-int [compile ?values special-args] (|do [:let [(&/$Cons ?x (&/$Nil)) ?values] =x (compile ?x)] - (return (str "LuxRT.fromNumberI64(" =x ")")))) + (return (str "LuxRT$fromNumberI64(" =x ")")))) (defn ^:private compile-deg-to-real [compile ?values special-args] (|do [:let [(&/$Cons ?x (&/$Nil)) ?values] =x (compile ?x)] - (return (str "LuxRT.degToReal(" =x ")")))) + (return (str "LuxRT$degToReal(" =x ")")))) (defn ^:private compile-real-to-deg [compile ?values special-args] (|do [:let [(&/$Cons ?x (&/$Nil)) ?values] =x (compile ?x)] - (return (str "LuxRT.realToDeg(" =x ")")))) + (return (str "LuxRT$realToDeg(" =x ")")))) (do-template [<name> <op>] (defn <name> [compile ?values special-args] @@ -311,7 +254,7 @@ =text (compile ?text) =part (compile ?part) =start (compile ?start)] - (return (str "LuxRT" "." <method> "(" =text "," =part "," =start ")")))) + (return (str "LuxRT$" <method> "(" =text "," =part "," =start ")")))) ^:private compile-text-last-index "lastIndex" ^:private compile-text-index "index" @@ -332,30 +275,30 @@ =text (compile ?text) =from (compile ?from) =to (compile ?to)] - (return (str "LuxRT.clip(" (str =text "," =from "," =to) ")")))) + (return (str "LuxRT$clip(" (str =text "," =from "," =to) ")")))) (defn ^:private compile-text-replace-all [compile ?values special-args] (|do [:let [(&/$Cons ?text (&/$Cons ?to-find (&/$Cons ?replace-with (&/$Nil)))) ?values] =text (compile ?text) =to-find (compile ?to-find) =replace-with (compile ?replace-with)] - (return (str "LuxRT.replaceAll(" (str =text "," =to-find "," =replace-with) ")")))) + (return (str "LuxRT$replaceAll(" (str =text "," =to-find "," =replace-with) ")")))) (defn ^:private compile-text-size [compile ?values special-args] (|do [:let [(&/$Cons ?text (&/$Nil)) ?values] =text (compile ?text)] - (return (str "LuxRT.fromNumberI64(" =text ".length" ")")))) + (return (str "LuxRT$fromNumberI64(" =text ".length" ")")))) (defn ^:private compile-text-hash [compile ?values special-args] (|do [:let [(&/$Cons ?text (&/$Nil)) ?values] =text (compile ?text)] - (return (str "LuxRT.textHash(" =text ")")))) + (return (str "LuxRT$textHash(" =text ")")))) (defn ^:private compile-text-char [compile ?values special-args] (|do [:let [(&/$Cons ?text (&/$Cons ?idx (&/$Nil))) ?values] =text (compile ?text) =idx (compile ?idx)] - (return (str "LuxRT.textChar(" (str =text "," =idx) ")")))) + (return (str "LuxRT$textChar(" (str =text "," =idx) ")")))) (do-template [<name> <method>] (defn <name> [compile ?values special-args] @@ -376,35 +319,35 @@ (defn ^:private compile-char-to-nat [compile ?values special-args] (|do [:let [(&/$Cons ?x (&/$Nil)) ?values] =x (compile ?x)] - (return (str "LuxRT.fromNumberI64(" (str "(" =x ").C" ".charCodeAt(0)") ")")))) + (return (str "LuxRT$fromNumberI64(" (str "(" =x ").C" ".charCodeAt(0)") ")")))) (defn ^:private compile-nat-to-char [compile ?values special-args] (|do [:let [(&/$Cons ?x (&/$Nil)) ?values] =x (compile ?x)] (return (str "{C:" (str "String.fromCharCode(" - (str "LuxRT.toNumberI64(" =x ")") + (str "LuxRT$toNumberI64(" =x ")") ")") "}")))) (defn ^:private compile-io-log [compile ?values special-args] (|do [:let [(&/$Cons ?message (&/$Nil)) ?values] =message (compile ?message)] - (return (str "LuxRT.log(" =message ")")))) + (return (str "LuxRT$log(" =message ")")))) (defn ^:private compile-io-error [compile ?values special-args] (|do [:let [(&/$Cons ?message (&/$Nil)) ?values] =message (compile ?message)] - (return (str "LuxRT.error(" =message ")")))) + (return (str "LuxRT$error(" =message ")")))) (defn ^:private compile-io-exit [compile ?values special-args] (|do [:let [(&/$Cons ?code (&/$Nil)) ?values] =code (compile ?code)] - (return (str "(process && process.exit && process.exit(LuxRT.fromNumberI64(" =code ")))")))) + (return (str "(process && process.exit && process.exit(LuxRT$fromNumberI64(" =code ")))")))) (defn ^:private compile-io-current-time [compile ?values special-args] (|do [:let [(&/$Nil) ?values]] - (return (str "LuxRT.toNumberI64(" "(new Date()).getTime()" ")")))) + (return (str "LuxRT$toNumberI64(" "(new Date()).getTime()" ")")))) (defn ^:private compile-atom-new [compile ?values special-args] (|do [:let [(&/$Cons ?init (&/$Nil)) ?values] @@ -434,7 +377,7 @@ (defn ^:private compile-process-concurrency-level [compile ?values special-args] (|do [:let [(&/$Nil) ?values]] - (return (str "LuxRT.fromNumberI64(1)")))) + (return (str "LuxRT$fromNumberI64(1)")))) (defn ^:private compile-process-future [compile ?values special-args] (|do [:let [(&/$Cons ?procedure (&/$Nil)) ?values] @@ -450,7 +393,7 @@ (return (str "setTimeout(" (str "function() {" =procedure "(null)" "}") "," - (str "LuxRT.toNumberI64(" =milliseconds ")") + (str "LuxRT$toNumberI64(" =milliseconds ")") ")")))) (do-template [<name> <field>] diff --git a/luxc/src/lux/compiler/js/proc/host.clj b/luxc/src/lux/compiler/js/proc/host.clj index 3c0392a6b..39bdb99c1 100644 --- a/luxc/src/lux/compiler/js/proc/host.clj +++ b/luxc/src/lux/compiler/js/proc/host.clj @@ -33,7 +33,7 @@ =object (compile ?object) =field (compile ?field) =args (&/map% compile ?args)] - (return (str "LuxRT." "jsObjectCall" + (return (str "LuxRT$" "jsObjectCall" "(" =object "," =field "," (str "[" (->> =args (&/|interpose ",") (&/fold str "")) "]") @@ -54,13 +54,13 @@ =object (compile ?object) =field (compile ?field) =input (compile ?input)] - (return (str "LuxRT." "jsSetField" "(" =object "," =field "," =input ")")))) + (return (str "LuxRT$" "jsSetField" "(" =object "," =field "," =input ")")))) (defn ^:private compile-js-delete-field [compile ?values special-args] (|do [:let [(&/$Cons ?object (&/$Cons ?field (&/$Nil))) ?values] =object (compile ?object) =field (compile ?field)] - (return (str "LuxRT." "jsDeleteField" "(" =object "," =field ")")))) + (return (str "LuxRT$" "jsDeleteField" "(" =object "," =field ")")))) (do-template [<name> <value>] (defn <name> [compile ?values special-args] diff --git a/luxc/src/lux/compiler/js/rt.clj b/luxc/src/lux/compiler/js/rt.clj index 1b07ed531..a70a59689 100644 --- a/luxc/src/lux/compiler/js/rt.clj +++ b/luxc/src/lux/compiler/js/rt.clj @@ -19,7 +19,7 @@ (str "[1,''," value "]")) (def ^:private adt-methods - {"product_getLeft" (str "(function product_getLeft(product,index) {" + {"product_getLeft" (str "(function LuxRT$product_getLeft(product,index) {" "var index_min_length = (index+1);" "if(product.length > index_min_length) {" ;; No need for recursion @@ -27,10 +27,10 @@ "}" "else {" ;; Needs recursion - "return product_getLeft(product[product.length - 1], (index_min_length - product.length));" + "return LuxRT$product_getLeft(product[product.length - 1], (index_min_length - product.length));" "}" "})") - "product_getRight" (str "(function product_getRight(product,index) {" + "product_getRight" (str "(function LuxRT$product_getRight(product,index) {" "var index_min_length = (index+1);" "if(product.length === index_min_length) {" ;; Last element. @@ -38,7 +38,7 @@ "}" "else if(product.length < index_min_length) {" ;; Needs recursion - "return product_getRight(product[product.length - 1], (index_min_length - product.length));" + "return LuxRT$product_getRight(product[product.length - 1], (index_min_length - product.length));" "}" "else {" ;; Must slice @@ -49,10 +49,10 @@ extact-match "return sum[2];" recursion-test (str (str "if(sum[1] === '') {" ;; Must recurse. - "return sum_get(sum[2], (wantedTag - sum[0]), wantsLast);" + "return LuxRT$sum_get(sum[2], (wantedTag - sum[0]), wantsLast);" "}" "else { " no-match " }"))] - (str "(function sum_get(sum,wantedTag,wantsLast) {" + (str "(function LuxRT$sum_get(sum,wantedTag,wantsLast) {" "if(wantedTag === sum[0]) {" (str "if(sum[1] === wantsLast) {" extact-match "}" "else {" recursion-test "}") @@ -67,51 +67,51 @@ "TWO_PWR_32" "((1 << 16) * (1 << 16))" "TWO_PWR_64" "(((1 << 16) * (1 << 16)) * ((1 << 16) * (1 << 16)))" "TWO_PWR_63" "((((1 << 16) * (1 << 16)) * ((1 << 16) * (1 << 16))) / 2)" - "getLowBitsUnsigned" (str "(function getLowBitsUnsigned(i64) {" - "return (i64.L >= 0) ? i64.L : (LuxRT.TWO_PWR_32 + i64.L);" + "getLowBitsUnsigned" (str "(function LuxRT$getLowBitsUnsigned(i64) {" + "return (i64.L >= 0) ? i64.L : (LuxRT$TWO_PWR_32 + i64.L);" "})") - "toNumberI64" (str "(function toNumberI64(i64) {" - "return (i64.H * LuxRT.TWO_PWR_32) + LuxRT.getLowBitsUnsigned(i64);" + "toNumberI64" (str "(function LuxRT$toNumberI64(i64) {" + "return (i64.H * LuxRT$TWO_PWR_32) + LuxRT$getLowBitsUnsigned(i64);" "})") - "fromNumberI64" (str "(function fromNumberI64(num) {" + "fromNumberI64" (str "(function LuxRT$fromNumberI64(num) {" (str "if (isNaN(num)) {" - "return LuxRT.ZERO;" + "return LuxRT$ZERO;" "}") - (str "else if (num <= -LuxRT.TWO_PWR_63) {" - "return LuxRT.MIN_VALUE_I64;" + (str "else if (num <= -LuxRT$TWO_PWR_63) {" + "return LuxRT$MIN_VALUE_I64;" "}") - (str "else if ((num + 1) >= LuxRT.TWO_PWR_63) {" - "return LuxRT.MAX_VALUE_I64;" + (str "else if ((num + 1) >= LuxRT$TWO_PWR_63) {" + "return LuxRT$MAX_VALUE_I64;" "}") (str "else if (num < 0) {" - "return LuxRT.negateI64(LuxRT.fromNumberI64(-num));" + "return LuxRT$negateI64(LuxRT$fromNumberI64(-num));" "}") (str "else {" - "return LuxRT.makeI64((num / LuxRT.TWO_PWR_32), (num % LuxRT.TWO_PWR_32));" + "return LuxRT$makeI64((num / LuxRT$TWO_PWR_32), (num % LuxRT$TWO_PWR_32));" "}") "})") - "makeI64" (str "(function makeI64(high,low) {" + "makeI64" (str "(function LuxRT$makeI64(high,low) {" "return { H: (high|0), L: (low|0)};" "})") "MIN_VALUE_I64" "{ H: (0x80000000|0), L: (0|0)}" "MAX_VALUE_I64" "{ H: (0x7FFFFFFF|0), L: (0xFFFFFFFF|0)}" "ONE" "{ H: (0|0), L: (1|0)}" "ZERO" "{ H: (0|0), L: (0|0)}" - "notI64" (str "(function notI64(i64) {" - "return LuxRT.makeI64(~i64.H,~i64.L);" + "notI64" (str "(function LuxRT$notI64(i64) {" + "return LuxRT$makeI64(~i64.H,~i64.L);" "})") - "negateI64" (str "(function negateI64(i64) {" - (str "if(LuxRT.eqI64(LuxRT.MIN_VALUE_I64,i64)) {" - "return LuxRT.MIN_VALUE_I64;" + "negateI64" (str "(function LuxRT$negateI64(i64) {" + (str "if(LuxRT$eqI64(LuxRT$MIN_VALUE_I64,i64)) {" + "return LuxRT$MIN_VALUE_I64;" "}") (str "else {" - "return LuxRT.addI64(LuxRT.notI64(i64),LuxRT.ONE);" + "return LuxRT$addI64(LuxRT$notI64(i64),LuxRT$ONE);" "}") "})") - "eqI64" (str "(function eqI64(l,r) {" + "eqI64" (str "(function LuxRT$eqI64(l,r) {" "return (l.H === r.H) && (l.L === r.L);" "})") - "addI64" (str "(function addI64(l,r) {" + "addI64" (str "(function LuxRT$addI64(l,r) {" "var l48 = l.H >>> 16;" "var l32 = l.H & 0xFFFF;" "var l16 = l.L >>> 16;" @@ -135,25 +135,25 @@ "x48 += l48 + r48;" "x48 &= 0xFFFF;" - "return LuxRT.makeI64((x48 << 16) | x32, (x16 << 16) | x00);" + "return LuxRT$makeI64((x48 << 16) | x32, (x16 << 16) | x00);" "})") - "subI64" (str "(function subI64(l,r) {" - "return LuxRT.addI64(l,LuxRT.negateI64(r));" + "subI64" (str "(function LuxRT$subI64(l,r) {" + "return LuxRT$addI64(l,LuxRT$negateI64(r));" "})") - "mulI64" (str "(function mulI64(l,r) {" + "mulI64" (str "(function LuxRT$mulI64(l,r) {" "if (l.H < 0) {" (str "if (r.H < 0) {" ;; Both are negative - "return mulI64(LuxRT.negateI64(l),LuxRT.negateI64(r));" + "return LuxRT$mulI64(LuxRT$negateI64(l),LuxRT$negateI64(r));" "}" "else {" ;; Left is negative - "return LuxRT.negateI64(mulI64(LuxRT.negateI64(l),r));" + "return LuxRT$negateI64(LuxRT$mulI64(LuxRT$negateI64(l),r));" "}") "}" "else if (r.H < 0) {" ;; Right is negative - "return LuxRT.negateI64(mulI64(l,LuxRT.negateI64(r)));" + "return LuxRT$negateI64(LuxRT$mulI64(l,LuxRT$negateI64(r)));" "}" ;; Both are positive "else {" @@ -189,10 +189,10 @@ "x48 += (l48 * r00) + (l32 * r16) + (l16 * r32) + (l00 * r48);" "x48 &= 0xFFFF;" - "return LuxRT.makeI64((x48 << 16) | x32, (x16 << 16) | x00);" + "return LuxRT$makeI64((x48 << 16) | x32, (x16 << 16) | x00);" "}" "})") - "divI64" (str "(function divI64(l,r) {" + "divI64" (str "(function LuxRT$divI64(l,r) {" (str "if((r.H === 0) && (r.L === 0)) {" ;; Special case: R = 0 "throw new Error('Cannot divide by zero!');" @@ -201,109 +201,109 @@ ;; Special case: L = 0 "return l;" "}") - (str "if(LuxRT.eqI64(l,LuxRT.MIN_VALUE_I64)) {" + (str "if(LuxRT$eqI64(l,LuxRT$MIN_VALUE_I64)) {" ;; Special case: L = MIN - (str "if(LuxRT.eqI64(r,LuxRT.ONE) || LuxRT.eqI64(r,LuxRT.negateI64(LuxRT.ONE))) {" + (str "if(LuxRT$eqI64(r,LuxRT$ONE) || LuxRT$eqI64(r,LuxRT$negateI64(LuxRT$ONE))) {" ;; Special case: L = MIN, R = 1|-1 - "return LuxRT.MIN_VALUE_I64;" + "return LuxRT$MIN_VALUE_I64;" "}" ;; Special case: L = R = MIN - "else if(LuxRT.eqI64(r,LuxRT.MIN_VALUE_I64)) {" - "return LuxRT.ONE;" + "else if(LuxRT$eqI64(r,LuxRT$MIN_VALUE_I64)) {" + "return LuxRT$ONE;" "}" ;; Special case: L = MIN "else {" - "var halfL = LuxRT.shrI64(l,1);" - "var approx = LuxRT.shlI64(LuxRT.divI64(halfL,r),LuxRT.ONE);" + "var halfL = LuxRT$shrI64(l,1);" + "var approx = LuxRT$shlI64(LuxRT$divI64(halfL,r),LuxRT$ONE);" (str "if((approx.H === 0) && (approx.L === 0)) {" (str "if(r.H < 0) {" - "return LuxRT.ONE;" + "return LuxRT$ONE;" "}" "else {" - "return LuxRT.negateI64(LuxRT.ONE);" + "return LuxRT$negateI64(LuxRT$ONE);" "}") "}" "else {" - "var rem = LuxRT.subI64(l,LuxRT.mulI64(r,approx));" - "return LuxRT.addI64(approx,LuxRT.divI64(rem,r));" + "var rem = LuxRT$subI64(l,LuxRT$mulI64(r,approx));" + "return LuxRT$addI64(approx,LuxRT$divI64(rem,r));" "}") "}") "}" - "else if(LuxRT.eqI64(r,LuxRT.MIN_VALUE_I64)) {" + "else if(LuxRT$eqI64(r,LuxRT$MIN_VALUE_I64)) {" ;; Special case: R = MIN - "return LuxRT.makeI64(0,0);" + "return LuxRT$makeI64(0,0);" "}") ;; Special case: negatives (str "if(l.H < 0) {" (str "if(r.H < 0) {" ;; Both are negative - "return LuxRT.divI64(LuxRT.negateI64(l),LuxRT.negateI64(r));" + "return LuxRT$divI64(LuxRT$negateI64(l),LuxRT$negateI64(r));" "}" "else {" ;; Only L is negative - "return LuxRT.negateI64(LuxRT.divI64(LuxRT.negateI64(l),r));" + "return LuxRT$negateI64(LuxRT$divI64(LuxRT$negateI64(l),r));" "}") "}" "else if(r.H < 0) {" ;; R is negative - "return LuxRT.negateI64(LuxRT.divI64(l,LuxRT.negateI64(r)));" + "return LuxRT$negateI64(LuxRT$divI64(l,LuxRT$negateI64(r)));" "}") ;; Common case - (str "var res = LuxRT.ZERO;" + (str "var res = LuxRT$ZERO;" "var rem = l;" - (str "while(LuxRT.ltI64(r,rem) || LuxRT.eqI64(r,rem)) {" - "var approx = Math.max(1, Math.floor(LuxRT.toNumberI64(rem) / LuxRT.toNumberI64(r)));" + (str "while(LuxRT$ltI64(r,rem) || LuxRT$eqI64(r,rem)) {" + "var approx = Math.max(1, Math.floor(LuxRT$toNumberI64(rem) / LuxRT$toNumberI64(r)));" "var log2 = Math.ceil(Math.log(approx) / Math.LN2);" "var delta = (log2 <= 48) ? 1 : Math.pow(2, log2 - 48);" - "var approxRes = LuxRT.fromNumberI64(approx);" - "var approxRem = LuxRT.mulI64(approxRes,r);" - (str "while((approxRem.H < 0) || LuxRT.ltI64(rem,approxRem)) {" + "var approxRes = LuxRT$fromNumberI64(approx);" + "var approxRem = LuxRT$mulI64(approxRes,r);" + (str "while((approxRem.H < 0) || LuxRT$ltI64(rem,approxRem)) {" "approx -= delta;" - "approxRes = LuxRT.fromNumberI64(approx);" - "approxRem = LuxRT.mulI64(approxRes,r);" + "approxRes = LuxRT$fromNumberI64(approx);" + "approxRem = LuxRT$mulI64(approxRes,r);" "}") (str "if((approxRes.H === 0) && (approxRes.L === 0)) {" - "approxRes = LuxRT.ONE;" + "approxRes = LuxRT$ONE;" "}") - "res = LuxRT.addI64(res,approxRes);" - "rem = LuxRT.subI64(rem,approxRem);" + "res = LuxRT$addI64(res,approxRes);" + "rem = LuxRT$subI64(rem,approxRem);" "}") "return res;") "})") - "remI64" (str "(function remI64(l,r) {" - "return LuxRT.subI64(l,LuxRT.mulI64(LuxRT.divI64(l,r),r));" + "remI64" (str "(function LuxRT$remI64(l,r) {" + "return LuxRT$subI64(l,LuxRT$mulI64(LuxRT$divI64(l,r),r));" "})") - "ltI64" (str "(function ltI64(l,r) {" + "ltI64" (str "(function LuxRT$ltI64(l,r) {" "var ln = l.H < 0;" "var rn = r.H < 0;" "if(ln && !rn) { return true; }" "if(!ln && rn) { return false; }" - "return (LuxRT.subI64(l,r).H < 0);" + "return (LuxRT$subI64(l,r).H < 0);" "})") - "encodeI64" (str "(function encodeI64(input) {" + "encodeI64" (str "(function LuxRT$encodeI64(input) {" ;; If input = 0 (str "if((input.H === 0) && (input.L === 0)) {" "return '0';" "}") ;; If input < 0 (str "if(input.H < 0) {" - (str "if(LuxRT.eqI64(input,LuxRT.MIN_VALUE_I64)) {" - "var radix = LuxRT.makeI64(0,10);" - "var div = LuxRT.divI64(input,radix);" - "var rem = LuxRT.subI64(LuxRT.mulI64(div,radix),input);" - "return LuxRT.encodeI64(div).concat(rem.L+'');" + (str "if(LuxRT$eqI64(input,LuxRT$MIN_VALUE_I64)) {" + "var radix = LuxRT$makeI64(0,10);" + "var div = LuxRT$divI64(input,radix);" + "var rem = LuxRT$subI64(LuxRT$mulI64(div,radix),input);" + "return LuxRT$encodeI64(div).concat(rem.L+'');" "}") "}" (str "else {" - "return '-'.concat(LuxRT.encodeI64(LuxRT.negateI64(input)));" + "return '-'.concat(LuxRT$encodeI64(LuxRT$negateI64(input)));" "}")) ;; If input > 0 - (str "var chunker = LuxRT.makeI64(0,1000000);" + (str "var chunker = LuxRT$makeI64(0,1000000);" "var rem = input;" "var result = '';" "while (true) {" - (str "var remDiv = LuxRT.divI64(rem,chunker);" - "var chunk = LuxRT.subI64(rem,LuxRT.mulI64(remDiv,chunker));" + (str "var remDiv = LuxRT$divI64(rem,chunker);" + "var chunk = LuxRT$subI64(rem,LuxRT$mulI64(remDiv,chunker));" "var digits = (chunk.L >>> 0)+'';" "rem = remDiv;" (str "if((rem.H === 0) && (rem.L === 0)) {" @@ -317,27 +317,27 @@ "}")) "}") "})") - "decodeI64" (str "(function decodeI64(input) {" - "input = LuxRT.clean_separators(input);" + "decodeI64" (str "(function LuxRT$decodeI64(input) {" + "input = LuxRT$clean_separators(input);" (str "if(/^-?\\d+$/.exec(input)) {" (str "var isNegative = (input.charAt(0) == '-');" "var sign = isNegative ? -1 : 1;" "input = isNegative ? input.substring(1) : input;" - "var chunkPower = LuxRT.fromNumberI64(Math.pow(10, 8));" - "var result = LuxRT.ZERO;" + "var chunkPower = LuxRT$fromNumberI64(Math.pow(10, 8));" + "var result = LuxRT$ZERO;" (str "for (var i = 0; i < input.length; i += 8) {" "var size = Math.min(8, input.length - i);" "var value = parseInt(input.substring(i, i + size), 10);" (str "if (size < 8) {" - "var power = LuxRT.fromNumberI64(Math.pow(10, size));" - "result = LuxRT.addI64(LuxRT.mulI64(result,power),LuxRT.fromNumberI64(value));" + "var power = LuxRT$fromNumberI64(Math.pow(10, size));" + "result = LuxRT$addI64(LuxRT$mulI64(result,power),LuxRT$fromNumberI64(value));" "}" "else {" - "result = LuxRT.addI64(LuxRT.mulI64(result,chunkPower),LuxRT.fromNumberI64(value));" + "result = LuxRT$addI64(LuxRT$mulI64(result,chunkPower),LuxRT$fromNumberI64(value));" "}") "}") - "result = LuxRT.mulI64(result,LuxRT.fromNumberI64(sign));" + "result = LuxRT$mulI64(result,LuxRT$fromNumberI64(sign));" (str "return " (make-some "result") ";") ) "}" @@ -348,32 +348,32 @@ }) (def ^:private n64-methods - {"divWord" (str "(function divWord(result, n, d) {" - "var dLong = LuxRT.makeI64(0,d);" - (str "if (LuxRT.eqI64(dLong,LuxRT.ONE)) {" + {"divWord" (str "(function LuxRT$divWord(result, n, d) {" + "var dLong = LuxRT$makeI64(0,d);" + (str "if (LuxRT$eqI64(dLong,LuxRT$ONE)) {" (str "result[0] = n.L;" "result[1] = 0;" "return") "}" "else {" ;; Approximate the quotient and remainder - (str "var q = LuxRT.divI64(LuxRT.ushrI64(n,1),LuxRT.ushrI64(dLong,1));" - "var r = LuxRT.subI64(n,LuxRT.mulI64(q,dLong));" + (str "var q = LuxRT$divI64(LuxRT$ushrI64(n,1),LuxRT$ushrI64(dLong,1));" + "var r = LuxRT$subI64(n,LuxRT$mulI64(q,dLong));" ;; Correct the approximation - (str "while(LuxRT.ltI64(r,LuxRT.ZERO)) {" - "r = LuxRT.addI64(r,dLong);" - "q = LuxRT.subI64(q,LuxRT.ONE);" + (str "while(LuxRT$ltI64(r,LuxRT$ZERO)) {" + "r = LuxRT$addI64(r,dLong);" + "q = LuxRT$subI64(q,LuxRT$ONE);" "}") - (str "while(LuxRT.ltI64(dLong,r) || LuxRT.eqI64(dLong,r)) {" - "r = LuxRT.subI64(r,dLong);" - "q = LuxRT.addI64(q,LuxRT.ONE);" + (str "while(LuxRT$ltI64(dLong,r) || LuxRT$eqI64(dLong,r)) {" + "r = LuxRT$subI64(r,dLong);" + "q = LuxRT$addI64(q,LuxRT$ONE);" "}") "result[0] = q.L;" "result[1] = r.L;" ) "}") "})") - "primitiveShiftLeftBigInt" (str "(function primitiveShiftLeftBigInt(input,shift) {" + "primitiveShiftLeftBigInt" (str "(function LuxRT$primitiveShiftLeftBigInt(input,shift) {" "var output = input.slice();" "var shift2 = 32 - shift;" (str "for(var i = 0, c = output[i], m = (i + (input.length - 1)); i < m; i++) {" @@ -384,7 +384,7 @@ "output[(input.length - 1)] <<= shift;" "return output;" "})") - "primitiveShiftRightBigInt" (str "(function primitiveShiftRightBigInt(input,shift) {" + "primitiveShiftRightBigInt" (str "(function LuxRT$primitiveShiftRightBigInt(input,shift) {" "var output = input.slice();" "var shift2 = 32 - shift;" (str "for(var i = (input.length - 1), c = output[i]; i > 0; i--) {" @@ -395,12 +395,12 @@ "output[0] >>>= shift;" "return output;" "})") - "shiftLeftBigInt" (str "(function shiftLeftBigInt(input,shift) {" + "shiftLeftBigInt" (str "(function LuxRT$shiftLeftBigInt(input,shift) {" "var shiftInts = shift >>> 5;" "var shiftBits = shift & 0x1F;" - "var bitsInHighWord = LuxRT.countI64(LuxRT.makeI64(input[0],0));" + "var bitsInHighWord = LuxRT$countI64(LuxRT$makeI64(input[0],0));" (str "if(shift <= (32 - bitsInHighWord)) {" - "var shifted = LuxRT.shlI64(LuxRT.makeI64(input[0],input[1]),shiftBits);" + "var shifted = LuxRT$shlI64(LuxRT$makeI64(input[0],input[1]),shiftBits);" "return [shifted.H,shifted.L];" "}") "var inputLen = input[0] === 0 ? 1 : 2;" @@ -416,47 +416,47 @@ "return input;" "}") (str "if(shiftBits <= (32 - bitsInHighWord)) {" - "return LuxRT.primitiveShiftLeftBigInt(input,shiftBits);" + "return LuxRT$primitiveShiftLeftBigInt(input,shiftBits);" "}" "else {" - "return LuxRT.primitiveShiftRightBigInt(input,(32 - shiftBits));" + "return LuxRT$primitiveShiftRightBigInt(input,(32 - shiftBits));" "}") "})") - "shiftRightBigInt" (str "(function shiftRightBigInt(input,shift) {" + "shiftRightBigInt" (str "(function LuxRT$shiftRightBigInt(input,shift) {" "var shiftInts = shift >>> 5;" "var shiftBits = shift & 0x1F;" "if(shiftBits === 0) { return input; }" - "var bitsInHighWord = LuxRT.countI64(LuxRT.makeI64(input[0],0));" + "var bitsInHighWord = LuxRT$countI64(LuxRT$makeI64(input[0],0));" (str "if(shiftBits >= bitsInHighWord) {" - "return LuxRT.primitiveShiftLeftBigInt(input,(32-shiftBits));" + "return LuxRT$primitiveShiftLeftBigInt(input,(32-shiftBits));" "}" "else {" - "return LuxRT.primitiveShiftRightBigInt(input,shiftBits);" + "return LuxRT$primitiveShiftRightBigInt(input,shiftBits);" "}") "})") - "mulsubBigInt" (str "(function mulsubBigInt(q, a, x, len, offset) {" - "var xLong = LuxRT.makeI64(0,x);" - "var carry = LuxRT.ZERO;" + "mulsubBigInt" (str "(function LuxRT$mulsubBigInt(q, a, x, len, offset) {" + "var xLong = LuxRT$makeI64(0,x);" + "var carry = LuxRT$ZERO;" "offset += len;" (str "for (var j = len-1; j >= 0; j--) {" - "var product = LuxRT.addI64(LuxRT.mulI64(LuxRT.makeI64(0,a[j]),xLong),carry);" - "var difference = LuxRT.subI64(LuxRT.makeI64(0,q[offset]),product);" - "carry = LuxRT.addI64(LuxRT.ushrI64(product,32),((difference.L > ~product.L) ? LuxRT.ONE : LuxRT.ZERO));" + "var product = LuxRT$addI64(LuxRT$mulI64(LuxRT$makeI64(0,a[j]),xLong),carry);" + "var difference = LuxRT$subI64(LuxRT$makeI64(0,q[offset]),product);" + "carry = LuxRT$addI64(LuxRT$ushrI64(product,32),((difference.L > ~product.L) ? LuxRT$ONE : LuxRT$ZERO));" "}") "return carry.L;" "})") - "divadd" (str "(function divadd(a, result, offset) {" - "var carry = LuxRT.ZERO;" + "divadd" (str "(function LuxRT$divadd(a, result, offset) {" + "var carry = LuxRT$ZERO;" (str "for (var j = a.length - 1; j >= 0; j--) {" - "var sum = LuxRT.addI64(LuxRT.addI64(LuxRT.makeI64(0,a[j]),LuxRT.makeI64(0,result[j+offset])),carry);" + "var sum = LuxRT$addI64(LuxRT$addI64(LuxRT$makeI64(0,a[j]),LuxRT$makeI64(0,result[j+offset])),carry);" "result[j+offset] = sum.L;" - "carry = LuxRT.ushrI64(sum,32);" + "carry = LuxRT$ushrI64(sum,32);" "}") "return carry.L;" "})") - "normalizeBigInt" (str "(function normalizeBigInt(input) {" + "normalizeBigInt" (str "(function LuxRT$normalizeBigInt(input) {" (str "if(input[0] !== 0) {" - "return LuxRT.makeI64(input[0],input[1]);" + "return LuxRT$makeI64(input[0],input[1]);" "}" "else {" (str "var numZeros = 0;" @@ -464,21 +464,21 @@ "numZeros++;" "} while(numZeros < input.length && input[numZeros] == 0);") "var tempInput = input.slice(input.length-Math.max(2,input.length-numZeros));" - "return LuxRT.makeI64(tempInput[0],tempInput[1]);") + "return LuxRT$makeI64(tempInput[0],tempInput[1]);") "}") "})") - "divmodBigInt" (str "(function divmodBigInt(subject,param) {" - (str "if(LuxRT.eqI64(param,LuxRT.ZERO)) {" + "divmodBigInt" (str "(function LuxRT$divmodBigInt(subject,param) {" + (str "if(LuxRT$eqI64(param,LuxRT$ZERO)) {" "throw new Error('Cannot divide by zero!');" "}") - (str "if(LuxRT.eqI64(subject,LuxRT.ZERO)) {" - "return [LuxRT.ZERO, LuxRT.ZERO];" + (str "if(LuxRT$eqI64(subject,LuxRT$ZERO)) {" + "return [LuxRT$ZERO, LuxRT$ZERO];" "}") - (str "if(LuxRT.ltN64(subject,param)) {" - "return [LuxRT.ZERO, subject];" + (str "if(LuxRT$ltN64(subject,param)) {" + "return [LuxRT$ZERO, subject];" "}") - (str "if(LuxRT.eqI64(subject,param)) {" - "return [LuxRT.ONE, LuxRT.ZERO];" + (str "if(LuxRT$eqI64(subject,param)) {" + "return [LuxRT$ONE, LuxRT$ZERO];" "}") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; "var divisor = param;" @@ -488,16 +488,16 @@ "var limit = subjLength - paramLength + 1;" "var quotient = (limit === 1) ? [0|0] : [0|0,0|0];" ;; Normalize the divisor - "var shift = 32 - LuxRT.countI64(LuxRT.makeI64(divisor.H,0));" + "var shift = 32 - LuxRT$countI64(LuxRT$makeI64(divisor.H,0));" (str "if (shift > 0) {" - "divisor = LuxRT.shlI64(divisor,shift);" - "remainder = LuxRT.shiftLeftBigInt(remainder,shift);" + "divisor = LuxRT$shlI64(divisor,shift);" + "remainder = LuxRT$shiftLeftBigInt(remainder,shift);" "}") (str "if((remainder.length-1) === subjLength) {" "remainder[0] = 0;" "}") "var dh = divisor.H;" - "var dhLong = LuxRT.makeI64(0,dh);" + "var dhLong = LuxRT$makeI64(0,dh);" "var dl = divisor.L;" "var qWord = [0|0,0|0];" ;; D2 Initialize j @@ -516,13 +516,13 @@ "skipCorrection = (qrem + 0x80000000) < nh2;") "}" "else {" - (str "var nChunk = LuxRT.orI64(LuxRT.shlI64(LuxRT.fromNumberI64(nh),32),LuxRT.fromNumberI64(nm));") - (str "if(LuxRT.ltI64(LuxRT.ZERO,nChunk) || LuxRT.eqI64(LuxRT.ZERO,nChunk)) {" - (str "qhat = LuxRT.divI64(nChunk,dhLong).L;" - "qrem = LuxRT.subI64(nChunk,LuxRT.mulI64(qhat, dhLong)).L;") + (str "var nChunk = LuxRT$orI64(LuxRT$shlI64(LuxRT$fromNumberI64(nh),32),LuxRT$fromNumberI64(nm));") + (str "if(LuxRT$ltI64(LuxRT$ZERO,nChunk) || LuxRT$eqI64(LuxRT$ZERO,nChunk)) {" + (str "qhat = LuxRT$divI64(nChunk,dhLong).L;" + "qrem = LuxRT$subI64(nChunk,LuxRT$mulI64(qhat, dhLong)).L;") "}" "else {" - (str "LuxRT.divWord(qWord, nChunk, dh);" + (str "LuxRT$divWord(qWord, nChunk, dh);" "qhat = qWord[0];" "qrem = qWord[1];" ) @@ -530,30 +530,30 @@ "if(qhat == 0) { continue; }" (str "if(!skipCorrection) {" ;; Correct qhat - (str "var qremLong = LuxRT.makeI64(0,qrem);" - "var dlLong = LuxRT.makeI64(0,dl);" - "var nl = LuxRT.makeI64(0,remainder[j+2]);" - "var rs = LuxRT.orI64(LuxRT.shlI64(qremLong,32),nl);" - "var estProduct = LuxRT.mulI64(dlLong,LuxRT.makeI64(0,qhat));" - (str "if(LuxRT.ltN64(rs,estProduct)) {" + (str "var qremLong = LuxRT$makeI64(0,qrem);" + "var dlLong = LuxRT$makeI64(0,dl);" + "var nl = LuxRT$makeI64(0,remainder[j+2]);" + "var rs = LuxRT$orI64(LuxRT$shlI64(qremLong,32),nl);" + "var estProduct = LuxRT$mulI64(dlLong,LuxRT$makeI64(0,qhat));" + (str "if(LuxRT$ltN64(rs,estProduct)) {" (str "qhat--;" - "qrem = LuxRT.addI64(qremLong,dhLong).L;" - "qremLong = LuxRT.makeI64(0,qrem);" - (str "if(LuxRT.ltI64(dhLong,qremLong) || LuxRT.eqI64(dhLong,qremLong)) {" - (str "estProduct = LuxRT.mulI64(dlLong,LuxRT.makeI64(0,qhat));" - "rs = LuxRT.orI64(LuxRT.shlI64(qremLong,32),nl);" - "if(LuxRT.ltN64(rs,estProduct)) { qhat--; }") + "qrem = LuxRT$addI64(qremLong,dhLong).L;" + "qremLong = LuxRT$makeI64(0,qrem);" + (str "if(LuxRT$ltI64(dhLong,qremLong) || LuxRT$eqI64(dhLong,qremLong)) {" + (str "estProduct = LuxRT$mulI64(dlLong,LuxRT$makeI64(0,qhat));" + "rs = LuxRT$orI64(LuxRT$shlI64(qremLong,32),nl);" + "if(LuxRT$ltN64(rs,estProduct)) { qhat--; }") "}")) "}") ) "}") ;; D4 Multiply and subtract "remainder[j] = 0;" - "var borrow = LuxRT.mulsubBigInt(remainder, divisor, qhat, paramLength, j);" + "var borrow = LuxRT$mulsubBigInt(remainder, divisor, qhat, paramLength, j);" ;; D5 Test remainder (str "if (borrow + 0x80000000 > nh2) {" ;; D6 Add back - "LuxRT.divadd(divisor, remainder, j+1);" + "LuxRT$divadd(divisor, remainder, j+1);" "qhat--;" "}") ;; Store the quotient digit @@ -561,35 +561,35 @@ "}") "}") ;; D7 loop on j ;; D8 Unnormalize - "if(shift > 0) { remainder = LuxRT.shiftRightBigInt(remainder,shift); }" - "return [LuxRT.normalizeBigInt(quotient), LuxRT.normalizeBigInt(remainder)];" + "if(shift > 0) { remainder = LuxRT$shiftRightBigInt(remainder,shift); }" + "return [LuxRT$normalizeBigInt(quotient), LuxRT$normalizeBigInt(remainder)];" "})") - "encodeN64" (str "(function encodeN64(input) {" + "encodeN64" (str "(function LuxRT$encodeN64(input) {" (str "if(input.H < 0) {" ;; Too big - "var lastDigit = LuxRT.remI64(input, LuxRT.makeI64(0,10));" - "var minusLastDigit = LuxRT.divI64(input, LuxRT.makeI64(0,10));" - "return '+'.concat(LuxRT.encodeI64(minusLastDigit)).concat(LuxRT.encodeI64(lastDigit));" + "var lastDigit = LuxRT$remI64(input, LuxRT$makeI64(0,10));" + "var minusLastDigit = LuxRT$divI64(input, LuxRT$makeI64(0,10));" + "return '+'.concat(LuxRT$encodeI64(minusLastDigit)).concat(LuxRT$encodeI64(lastDigit));" "}" "else {" ;; Small enough - "return '+'.concat(LuxRT.encodeI64(input));" + "return '+'.concat(LuxRT$encodeI64(input));" "}") "})") - "decodeN64" (str "(function decodeN64(input) {" - "input = LuxRT.clean_separators(input);" + "decodeN64" (str "(function LuxRT$decodeN64(input) {" + "input = LuxRT$clean_separators(input);" (str "if(/^\\+\\d+$/.exec(input)) {" (str "input = input.substring(1);") (str "if(input.length <= 18) {" ;; Short enough... - "return LuxRT.decodeI64(input);" + "return LuxRT$decodeI64(input);" "}" "else {" ;; Too long - (str "var prefix = LuxRT.decodeI64(input.substring(0, input.length-1))[2];" - "var suffix = LuxRT.decodeI64(input.charAt(input.length-1))[2];" - "var total = LuxRT.addI64(LuxRT.mulI64(prefix,LuxRT.fromNumberI64(10)),suffix);" - (str "if(LuxRT.ltN64(total,prefix)) {" + (str "var prefix = LuxRT$decodeI64(input.substring(0, input.length-1))[2];" + "var suffix = LuxRT$decodeI64(input.charAt(input.length-1))[2];" + "var total = LuxRT$addI64(LuxRT$mulI64(prefix,LuxRT$fromNumberI64(10)),suffix);" + (str "if(LuxRT$ltN64(total,prefix)) {" (str "return " const-none ";") "}" "else {" @@ -601,84 +601,84 @@ (str "return " const-none ";") "}") "})") - "divN64" (str "(function divN64(l,r) {" - (str "if(LuxRT.ltI64(r,LuxRT.ZERO)) {" - (str "if(LuxRT.ltN64(l,r)) {" - "return LuxRT.ZERO;" + "divN64" (str "(function LuxRT$divN64(l,r) {" + (str "if(LuxRT$ltI64(r,LuxRT$ZERO)) {" + (str "if(LuxRT$ltN64(l,r)) {" + "return LuxRT$ZERO;" "}" "else {" - "return LuxRT.ONE;" + "return LuxRT$ONE;" "}") "}" - "else if(LuxRT.ltI64(LuxRT.ZERO,l)) {" - "return LuxRT.divI64(l,r);" + "else if(LuxRT$ltI64(LuxRT$ZERO,l)) {" + "return LuxRT$divI64(l,r);" "}" "else {" - (str "if(LuxRT.eqI64(LuxRT.ZERO,r)) {" + (str "if(LuxRT$eqI64(LuxRT$ZERO,r)) {" "throw new Error('Cannot divide by zero!');" "}" "else {" - (str "if(LuxRT.ltI64(l,r)) {" - "return LuxRT.ZERO;" + (str "if(LuxRT$ltI64(l,r)) {" + "return LuxRT$ZERO;" "}" "else {" - "return LuxRT.divmodBigInt(l,r)[0];" + "return LuxRT$divmodBigInt(l,r)[0];" "}") "}") "}") "})") - "remN64" (str "(function remN64(l,r) {" - (str "if(LuxRT.ltI64(l,LuxRT.ZERO) || LuxRT.ltI64(r,LuxRT.ZERO)) {" - (str "if(LuxRT.ltN64(l,r)) {" + "remN64" (str "(function LuxRT$remN64(l,r) {" + (str "if(LuxRT$ltI64(l,LuxRT$ZERO) || LuxRT$ltI64(r,LuxRT$ZERO)) {" + (str "if(LuxRT$ltN64(l,r)) {" "return l;" "}" "else {" - "return LuxRT.divmodBigInt(l,r)[1];" + "return LuxRT$divmodBigInt(l,r)[1];" "}") "}" "else {" - "return LuxRT.remI64(l,r);" + "return LuxRT$remI64(l,r);" "}") "})") - "ltN64" (str "(function ltN64(l,r) {" - "var li = LuxRT.addI64(l,LuxRT.MIN_VALUE_I64);" - "var ri = LuxRT.addI64(r,LuxRT.MIN_VALUE_I64);" - "return LuxRT.ltI64(li,ri);" + "ltN64" (str "(function LuxRT$ltN64(l,r) {" + "var li = LuxRT$addI64(l,LuxRT$MIN_VALUE_I64);" + "var ri = LuxRT$addI64(r,LuxRT$MIN_VALUE_I64);" + "return LuxRT$ltI64(li,ri);" "})") }) (def ^:private d64-methods - {"mulD64" (str "(function mulD64(l,r) {" - "var lL = LuxRT.fromNumberI64(l.L);" - "var rL = LuxRT.fromNumberI64(r.L);" - "var lH = LuxRT.fromNumberI64(l.H);" - "var rH = LuxRT.fromNumberI64(r.H);" + {"mulD64" (str "(function LuxRT$mulD64(l,r) {" + "var lL = LuxRT$fromNumberI64(l.L);" + "var rL = LuxRT$fromNumberI64(r.L);" + "var lH = LuxRT$fromNumberI64(l.H);" + "var rH = LuxRT$fromNumberI64(r.H);" - "var bottom = LuxRT.ushrI64(LuxRT.mulI64(lL,rL),32);" - "var middle = LuxRT.addI64(LuxRT.mulI64(lH,rL),LuxRT.mulI64(lL,rH));" - "var top = LuxRT.mulI64(lH,rH);" + "var bottom = LuxRT$ushrI64(LuxRT$mulI64(lL,rL),32);" + "var middle = LuxRT$addI64(LuxRT$mulI64(lH,rL),LuxRT$mulI64(lL,rH));" + "var top = LuxRT$mulI64(lH,rH);" - "var bottomAndMiddle = LuxRT.ushrI64(LuxRT.addI64(middle,bottom),32);" + "var bottomAndMiddle = LuxRT$ushrI64(LuxRT$addI64(middle,bottom),32);" - "return LuxRT.addI64(top,bottomAndMiddle);" + "return LuxRT$addI64(top,bottomAndMiddle);" "})") - "divD64" (str "(function divD64(l,r) {" - "return LuxRT.shlI64(LuxRT.divI64(l,LuxRT.fromNumberI64(r.H)),32);" + "divD64" (str "(function LuxRT$divD64(l,r) {" + "return LuxRT$shlI64(LuxRT$divI64(l,LuxRT$fromNumberI64(r.H)),32);" "})") - "degToReal" (str "(function degToReal(input) {" + "degToReal" (str "(function LuxRT$degToReal(input) {" "var two32 = Math.pow(2,32);" "var high = input.H / two32;" "var low = (input.L / two32) / two32;" "return high+low;" "})") - "realToDeg" (str "(function realToDeg(input) {" + "realToDeg" (str "(function LuxRT$realToDeg(input) {" "var two32 = Math.pow(2,32);" "var shifted = (input % 1.0) * two32;" "var low = ((shifted % 1.0) * two32) | 0;" "var high = shifted | 0;" - "return LuxRT.makeI64(high,low);" + "return LuxRT$makeI64(high,low);" "})") - "_add_deg_digit_powers" (str "(function _add_deg_digit_powers(left,right) {" + "_add_deg_digit_powers" (str "(function LuxRT$_add_deg_digit_powers(left,right) {" "var output = new Array(64);" "var carry = 0;" (str "for(var idx = 63; idx >= 0; idx--) {" @@ -688,7 +688,7 @@ "}") "return output;" "})") - "_times5" (str "(function _times5(exp,digits) {" + "_times5" (str "(function LuxRT$_times5(exp,digits) {" "var carry = 0;" (str "for(var idx = exp; idx >= 0; idx--) {" "var raw = (digits[exp] * 5) + carry;" @@ -697,15 +697,15 @@ "}") "return digits;" "})") - "_deg_digit_power" (str "(function _deg_digit_power(exp) {" + "_deg_digit_power" (str "(function LuxRT$_deg_digit_power(exp) {" "var digits = new Array(64);" "digits[exp] = 1;" (str "for(var idx = exp; idx >= 0; idx--) {" - "digits = LuxRT._times5(exp,digits);" + "digits = LuxRT$_times5(exp,digits);" "}") "return digits;" "})") - "_bitIsSet" (str "(function _bitIsSet(input,idx) {" + "_bitIsSet" (str "(function LuxRT$_bitIsSet(input,idx) {" "idx &= 63;" (str "if(idx < 32) {" "return (input.L & (1 << idx)) !== 0;" @@ -714,28 +714,28 @@ "return (input.H & (1 << (idx - 32))) !== 0;" "}") "})") - "encodeD64" (str "(function encodeD64(input) {" - (str "if(LuxRT.eqI64(input,LuxRT.ZERO)) {" + "encodeD64" (str "(function LuxRT$encodeD64(input) {" + (str "if(LuxRT$eqI64(input,LuxRT$ZERO)) {" "return '.0';" "}") "var digits = new Array(64);" (str "for(var idx = 63; idx >= 0; idx--) {" - (str "if(LuxRT._bitIsSet(input,idx)) {" - "var power = LuxRT._deg_digit_power(63 - idx);" - "digits = LuxRT._add_deg_digit_powers(digits,power);" + (str "if(LuxRT$_bitIsSet(input,idx)) {" + "var power = LuxRT$_deg_digit_power(63 - idx);" + "digits = LuxRT$_add_deg_digit_powers(digits,power);" "}") "}") "var raw = '.'.concat(digits.join(''));" "return raw.split(/0*$/)[0];" "})") - "deg_text_to_digits" (str "(function deg_text_to_digits(input) {" + "deg_text_to_digits" (str "(function LuxRT$deg_text_to_digits(input) {" "var output = new Array(64);" (str "for(var idx = input.length-1; idx >= 0; idx--) {" "output[idx] = parseInt(input.substring(idx, idx+1));" "}") "return output;" "})") - "deg_digits_lt" (str "(function deg_digits_lt(l,r) {" + "deg_digits_lt" (str "(function LuxRT$deg_digits_lt(l,r) {" (str "for(var idx = 0; idx < 64; idx++) {" (str "if(l[idx] < r[idx]) {" "return true;" @@ -746,7 +746,7 @@ "}") "return false;" "})") - "deg_digits_sub_once" (str "(function deg_digits_sub_once(target,digit,idx) {" + "deg_digits_sub_once" (str "(function LuxRT$deg_digits_sub_once(target,digit,idx) {" (str "while(true) {" (str "if(target[idx] > digit) {" (str "target[idx] = target[idx] - digit;" @@ -759,25 +759,25 @@ "}") "}") "})") - "deg_digits_sub" (str "(function deg_digits_sub(l,r) {" + "deg_digits_sub" (str "(function LuxRT$deg_digits_sub(l,r) {" (str "for(var idx = 63; idx >= 0; idx--) {" - "l = LuxRT.deg_digits_sub_once(l,r[idx],idx);" + "l = LuxRT$deg_digits_sub_once(l,r[idx],idx);" "}") "return l;" "})") "decodeD64" (let [failure (str "return " const-none ";")] - (str "(function decodeD64(input) {" - "input = LuxRT.clean_separators(input);" + (str "(function LuxRT$decodeD64(input) {" + "input = LuxRT$clean_separators(input);" (str "if(/^\\.\\d+$/.exec(input) && input.length <= 65) {" (str "try {" - (str "var digits = LuxRT.deg_text_to_digits(input.substring(1));") - "var output = LuxRT.makeI64(0,0);" + (str "var digits = LuxRT$deg_text_to_digits(input.substring(1));") + "var output = LuxRT$makeI64(0,0);" (str "for(var idx = 0; idx < 64; idx++) {" - "var power = LuxRT.deg_text_to_digits(idx);" - (str "if(LuxRT.deg_digits_lt(power,digits)) {" - (str "digits = LuxRT.deg_digits_sub(digits,power);" - "var powerBit = LuxRT.shlI64(LuxRT.makeI64(0,1),(63-idx));" - "output = LuxRT.orI64(output,powerBit);") + "var power = LuxRT$deg_text_to_digits(idx);" + (str "if(LuxRT$deg_digits_lt(power,digits)) {" + (str "digits = LuxRT$deg_digits_sub(digits,power);" + "var powerBit = LuxRT$shlI64(LuxRT$makeI64(0,1),(63-idx));" + "output = LuxRT$orI64(output,powerBit);") "}") "}") (str "return " (make-some "output") ";") @@ -793,36 +793,36 @@ }) (def ^:private io-methods - {"log" (str "(function log(message) {" + {"log" (str "(function LuxRT$log(message) {" "console.log(message);" (str "return " &&/unit ";") "})") - "error" (str "(function error(message) {" + "error" (str "(function LuxRT$error(message) {" "throw new Error(message);" (str "return null;") "})") }) (def ^:private text-methods - {"index" (str "(function index(text,part,start) {" - "var idx = text.indexOf(part,LuxRT.toNumberI64(start));" + {"index" (str "(function LuxRT$index(text,part,start) {" + "var idx = text.indexOf(part,LuxRT$toNumberI64(start));" (str (str "if(idx === -1) {" "return " const-none ";" "}") (str "else {" - (str "return " (make-some "LuxRT.fromNumberI64(idx)") ";") + (str "return " (make-some "LuxRT$fromNumberI64(idx)") ";") "}")) "})") - "lastIndex" (str "(function lastIndex(text,part,start) {" - "var idx = text.lastIndexOf(part,LuxRT.toNumberI64(start));" + "lastIndex" (str "(function LuxRT$lastIndex(text,part,start) {" + "var idx = text.lastIndexOf(part,LuxRT$toNumberI64(start));" (str (str "if(idx === -1) {" "return " const-none ";" "}") (str "else {" - (str "return " (make-some "LuxRT.fromNumberI64(idx)") ";") + (str "return " (make-some "LuxRT$fromNumberI64(idx)") ";") "}")) "})") - "clip" (str "(function clip(text,from,to) {" + "clip" (str "(function LuxRT$clip(text,from,to) {" (str "if(from.L > text.length || to.L > text.length) {" (str "return " const-none ";") "}" @@ -830,11 +830,11 @@ (str "return " (make-some "text.substring(from.L,to.L)") ";") "}") "})") - "replaceAll" (str "(function replaceAll(text,toFind,replaceWith) {" + "replaceAll" (str "(function LuxRT$replaceAll(text,toFind,replaceWith) {" "var reEscaped = toFind.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&');" "return text.replace(new RegExp(reEscaped, 'g'), replaceWith);" "})") - "textChar" (str "(function textChar(text,idx) {" + "textChar" (str "(function LuxRT$textChar(text,idx) {" "var result = text.charAt(idx.L);" (str "if(result === '') {" (str "return " const-none ";") @@ -845,18 +845,18 @@ "var reEscaped = toFind.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&');" "return text.replace(new RegExp(reEscaped, 'g'), replaceWith);" "})") - "textHash" (str "(function(input) {" + "textHash" (str "(function LuxRT$textHash(input) {" "var hash = 0;" (str "for(var i = 0; i < input.length; i++) {" "hash = (((hash << 5) - hash) + input.charCodeAt(i)) & 0xFFFFFFFF;" "}") - "return LuxRT.fromNumberI64(hash);" + "return LuxRT$fromNumberI64(hash);" "})") }) (def ^:private array-methods - {"arrayGet" (str "(function arrayGet(arr,idx) {" - "var temp = arr[LuxRT.toNumberI64(idx)];" + {"arrayGet" (str "(function LuxRT$arrayGet(arr,idx) {" + "var temp = arr[LuxRT$toNumberI64(idx)];" (str "if(temp !== undefined) {" (str "return " (make-some "temp") ";") "}" @@ -864,31 +864,31 @@ (str "return " const-none ";") "}") "})") - "arrayPut" (str "(function arrayPut(arr,idx,val) {" - "arr[LuxRT.toNumberI64(idx)] = val;" + "arrayPut" (str "(function LuxRT$arrayPut(arr,idx,val) {" + "arr[LuxRT$toNumberI64(idx)] = val;" "return arr;" "})") - "arrayRemove" (str "(function arrayRemove(arr,idx) {" - "delete arr[LuxRT.toNumberI64(idx)];" + "arrayRemove" (str "(function LuxRT$arrayRemove(arr,idx) {" + "delete arr[LuxRT$toNumberI64(idx)];" "return arr;" "})") }) (def ^:private bit-methods - (let [make-basic-op (fn [op] - (str "(function andI64(input,mask) {" - "return LuxRT.makeI64(input.H " op " mask.H, input.L " op " mask.L);" + (let [make-basic-op (fn [op name] + (str "(function " name "(input,mask) {" + "return LuxRT$makeI64(input.H " op " mask.H, input.L " op " mask.L);" "})"))] - {"andI64" (make-basic-op "&") - "orI64" (make-basic-op "|") - "xorI64" (make-basic-op "^") - "countI64" (str "(function countI64(input) {" + {"andI64" (make-basic-op "&" "LuxRT$andI64") + "orI64" (make-basic-op "|" "LuxRT$orI64") + "xorI64" (make-basic-op "^" "LuxRT$xorI64") + "countI64" (str "(function LuxRT$countI64(input) {" "var hs = (input.H).toString(2);" "var ls = (input.L).toString(2);" "var num1s = hs.concat(ls).replace(/0/g,'').length;" - "return LuxRT.fromNumberI64(num1s);" + "return LuxRT$fromNumberI64(num1s);" "})") - "shlI64" (str "(function shlI64(input,shift) {" + "shlI64" (str "(function LuxRT$shlI64(input,shift) {" "shift &= 63;" (str "if(shift === 0) {" "return input;" @@ -897,15 +897,15 @@ (str "if (shift < 32) {" "var high = (input.H << shift) | (input.L >>> (32 - shift));" "var low = input.L << shift;" - "return LuxRT.makeI64(high, low);" + "return LuxRT$makeI64(high, low);" "}" "else {" "var high = (input.L << (shift - 32));" - "return LuxRT.makeI64(high, 0);" + "return LuxRT$makeI64(high, 0);" "}") "}") "})") - "shrI64" (str "(function shrI64(input,shift) {" + "shrI64" (str "(function LuxRT$shrI64(input,shift) {" "shift &= 63;" (str "if(shift === 0) {" "return input;" @@ -914,16 +914,16 @@ (str "if (shift < 32) {" "var high = input.H >> shift;" "var low = (input.L >>> shift) | (input.H << (32 - shift));" - "return LuxRT.makeI64(high, low);" + "return LuxRT$makeI64(high, low);" "}" "else {" "var low = (input.H >> (shift - 32));" "var high = input.H >= 0 ? 0 : -1;" - "return LuxRT.makeI64(high, low);" + "return LuxRT$makeI64(high, low);" "}") "}") "})") - "ushrI64" (str "(function ushrI64(input,shift) {" + "ushrI64" (str "(function LuxRT$ushrI64(input,shift) {" "shift &= 63;" (str "if(shift === 0) {" "return input;" @@ -932,24 +932,24 @@ (str "if (shift < 32) {" "var high = input.H >>> shift;" "var low = (input.L >>> shift) | (input.H << (32 - shift));" - "return LuxRT.makeI64(high, low);" + "return LuxRT$makeI64(high, low);" "}" "else if(shift === 32) {" - "return LuxRT.makeI64(0, input.H);" + "return LuxRT$makeI64(0, input.H);" "}" "else {" "var low = (input.H >>> (shift - 32));" - "return LuxRT.makeI64(0, low);" + "return LuxRT$makeI64(0, low);" "}") "}") "})") })) (def ^:private lux-methods - {"clean_separators" (str "(function clean_separators(input) {" + {"clean_separators" (str "(function LuxRT$clean_separators(input) {" "return input.replace(/_/g,'');" "})") - "runTry" (str "(function runTry(op) {" + "runTry" (str "(function LuxRT$runTry(op) {" (str "try {" (str "return [1,'',op(null)];") "}" @@ -957,7 +957,7 @@ (str "return [0,null,ex.toString()];") "}") "})") - "programArgs" (str "(function programArgs() {" + "programArgs" (str "(function LuxRT$programArgs() {" (str "if(typeof process !== 'undefined' && process.argv) {" (str (str "var result = " const-none ";") "for(var idx = process.argv.length-1; idx >= 0; idx--) {" @@ -972,15 +972,15 @@ }) (def ^:private js-methods - {"jsSetField" (str "(function jsSetField(object, field, input) {" + {"jsSetField" (str "(function LuxRT$jsSetField(object, field, input) {" "object[field] = input;" "return object;" "})") - "jsDeleteField" (str "(function jsDeleteField(object, field) {" + "jsDeleteField" (str "(function LuxRT$jsDeleteField(object, field) {" "delete object[field];" "return object;" "})") - "jsObjectCall" (str "(function jsObjectCall(object, method, args) {" + "jsObjectCall" (str "(function LuxRT$jsObjectCall(object, method, args) {" "return object[method].apply(object, args);" "})") }) @@ -988,20 +988,16 @@ (def LuxRT "LuxRT") (def compile-LuxRT - (|do [:let [rt-object (str "{" (->> (merge lux-methods - adt-methods - i64-methods - n64-methods - d64-methods - text-methods - array-methods - bit-methods - io-methods - js-methods) - (map (fn [[key val]] - (str key ":" val))) - (interpose ",") - (reduce str "")) - "}")]] - (&&/save-js! LuxRT - (str "var " LuxRT " = " rt-object ";")))) + (&&/save-js! LuxRT + (->> (merge lux-methods + adt-methods + i64-methods + n64-methods + d64-methods + text-methods + array-methods + bit-methods + io-methods + js-methods) + (reduce (fn [prev [key val]] (str prev "var LuxRT$" key " = " val ";\n")) + "")))) |