diff options
| author | Eduardo Julian | 2019-04-28 02:09:34 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2019-04-28 02:09:34 -0400 |
| commit | 0c20f4a8362d42572edecb6ef9844b75c4c859f8 (patch) | |
| tree | d40ce3ab8107647d9e929302d5f8a2c52c94b6fc /luxc/src | |
| parent | 41b83b7a2d3be8f454f780dca497c4eeed900bbf (diff) | |
Turned all "lux int ???" extensions to "lux i64 ???".
Diffstat (limited to 'luxc/src')
| -rw-r--r-- | luxc/src/lux/analyser/proc/common.clj | 24 | ||||
| -rw-r--r-- | luxc/src/lux/compiler/jvm/proc/common.clj | 19 |
2 files changed, 20 insertions, 23 deletions
diff --git a/luxc/src/lux/analyser/proc/common.clj b/luxc/src/lux/analyser/proc/common.clj index d08b6f402..75c2cd3c9 100644 --- a/luxc/src/lux/analyser/proc/common.clj +++ b/luxc/src/lux/analyser/proc/common.clj @@ -151,10 +151,10 @@ analyse-i64-add ["i64" "+"] (&/$Apply &type/Any &type/I64) &type/I64 analyse-i64-sub ["i64" "-"] (&/$Apply &type/Any &type/I64) &type/I64 - analyse-int-mul ["int" "*"] &type/Int &type/Int - analyse-int-div ["int" "/"] &type/Int &type/Int - analyse-int-rem ["int" "%"] &type/Int &type/Int - analyse-int-lt ["int" "<"] &type/Int &type/Bit + analyse-int-mul ["i64" "*"] &type/Int &type/Int + analyse-int-div ["i64" "/"] &type/Int &type/Int + analyse-int-rem ["i64" "%"] &type/Int &type/Int + analyse-int-lt ["i64" "<"] &type/Int &type/Bit analyse-frac-add ["f64" "+"] &type/Frac &type/Frac analyse-frac-sub ["f64" "-"] &type/Frac &type/Frac @@ -208,8 +208,8 @@ (return (&/|list (&&/|meta exo-type _cursor (&&/$proc (&/T <op>) (&/|list =x) (&/|list))))))) - analyse-int-char &type/Int &type/Text ["int" "char"] - analyse-int-frac &type/Int &type/Frac ["int" "f64"] + analyse-int-char &type/Int &type/Text ["i64" "char"] + analyse-int-frac &type/Int &type/Frac ["i64" "f64"] analyse-frac-int &type/Frac &type/Int ["f64" "i64"] analyse-io-log &type/Text &type/Any ["io" "log"] @@ -274,12 +274,12 @@ "lux i64 -" (analyse-i64-sub analyse exo-type ?values) "lux i64 =" (analyse-i64-eq analyse exo-type ?values) - "lux int *" (analyse-int-mul analyse exo-type ?values) - "lux int /" (analyse-int-div analyse exo-type ?values) - "lux int %" (analyse-int-rem analyse exo-type ?values) - "lux int <" (analyse-int-lt analyse exo-type ?values) - "lux int f64" (analyse-int-frac analyse exo-type ?values) - "lux int char" (analyse-int-char analyse exo-type ?values) + "lux i64 *" (analyse-int-mul analyse exo-type ?values) + "lux i64 /" (analyse-int-div analyse exo-type ?values) + "lux i64 %" (analyse-int-rem analyse exo-type ?values) + "lux i64 <" (analyse-int-lt analyse exo-type ?values) + "lux i64 f64" (analyse-int-frac analyse exo-type ?values) + "lux i64 char" (analyse-int-char analyse exo-type ?values) "lux f64 +" (analyse-frac-add analyse exo-type ?values) "lux f64 -" (analyse-frac-sub analyse exo-type ?values) diff --git a/luxc/src/lux/compiler/jvm/proc/common.clj b/luxc/src/lux/compiler/jvm/proc/common.clj index bf1ca306e..88b989262 100644 --- a/luxc/src/lux/compiler/jvm/proc/common.clj +++ b/luxc/src/lux/compiler/jvm/proc/common.clj @@ -448,18 +448,15 @@ "logical-right-shift" (compile-i64-logical-right-shift compile ?values special-args) "=" (compile-i64-eq compile ?values special-args) "+" (compile-i64-add compile ?values special-args) - "-" (compile-i64-sub compile ?values special-args)) - - "int" - (case proc - "*" (compile-int-mul compile ?values special-args) - "/" (compile-int-div compile ?values special-args) - "%" (compile-int-rem compile ?values special-args) - "<" (compile-int-lt compile ?values special-args) - "f64" (compile-int-frac compile ?values special-args) - "char" (compile-int-char compile ?values special-args) + "-" (compile-i64-sub compile ?values special-args) + "*" (compile-int-mul compile ?values special-args) + "/" (compile-int-div compile ?values special-args) + "%" (compile-int-rem compile ?values special-args) + "<" (compile-int-lt compile ?values special-args) + "f64" (compile-int-frac compile ?values special-args) + "char" (compile-int-char compile ?values special-args) ) - + "f64" (case proc "+" (compile-frac-add compile ?values special-args) |