From 00d5ccbc043960037f644d4ff09b6a46fd0093d0 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Mon, 12 Oct 2020 20:22:31 -0400 Subject: Type-checking macros via the Macro' type from the standard library. --- lux-jvm/source/luxc/lang/translation/jvm.lux | 8 ++++---- lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux | 10 +++++----- lux-jvm/source/luxc/lang/translation/jvm/primitive.lux | 6 +++--- lux-jvm/source/luxc/lang/translation/jvm/structure.lux | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'lux-jvm/source/luxc/lang/translation') diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux index 0ffea0e42..30a130150 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm.lux @@ -41,16 +41,16 @@ ["." inst]]]] ) -(import: #long java/lang/reflect/Field +(import: java/lang/reflect/Field (get [#? java/lang/Object] #try #? java/lang/Object)) -(import: #long (java/lang/Class a) +(import: (java/lang/Class a) (getField [java/lang/String] #try java/lang/reflect/Field)) -(import: #long java/lang/Object +(import: java/lang/Object (getClass [] (java/lang/Class java/lang/Object))) -(import: #long java/lang/ClassLoader) +(import: java/lang/ClassLoader) (type: #export ByteCode Binary) diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux index 383415c0a..0388c5c7f 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux @@ -53,8 +53,8 @@ (phase.throw extension.invalid-syntax [extension-name %synthesis input])))) (import: java/lang/Double - (#static MIN_VALUE Double) - (#static MAX_VALUE Double)) + (#static MIN_VALUE java/lang/Double) + (#static MAX_VALUE java/lang/Double)) (def: $String (type.class "java.lang.String" (list))) (def: $CharSequence (type.class "java.lang.CharSequence" (list))) @@ -164,9 +164,9 @@ (Nullary Inst) (|>> (_.wrap )))] - [f64::smallest (_.double (Double::MIN_VALUE)) type.double] - [f64::min (_.double (f.* -1.0 (Double::MAX_VALUE))) type.double] - [f64::max (_.double (Double::MAX_VALUE)) type.double] + [f64::smallest (_.double (java/lang/Double::MIN_VALUE)) type.double] + [f64::min (_.double (f.* -1.0 (java/lang/Double::MAX_VALUE))) type.double] + [f64::max (_.double (java/lang/Double::MAX_VALUE)) type.double] ) (template [ ] diff --git a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux index 24eeef49e..d8ab2cbee 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux @@ -22,11 +22,11 @@ (function (_ value) (operation@wrap (_.GETSTATIC Boolean (if value "TRUE" "FALSE") Boolean))))) -(import: #long java/lang/Byte +(import: java/lang/Byte (#static MAX_VALUE byte) (#static MIN_VALUE byte)) -(import: #long java/lang/Short +(import: java/lang/Short (#static MAX_VALUE short) (#static MIN_VALUE short)) @@ -63,7 +63,7 @@ (|> value .int _.long))] (operation@wrap (|>> constantI (_.wrap type.long)))))) -(import: #long java/lang/Double +(import: java/lang/Double (#static doubleToRawLongBits #manual [double] int)) (def: d0-bits diff --git a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux index c61f96bb8..4a4c30e0f 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux @@ -60,11 +60,11 @@ (_.array //runtime.$Value) membersI)))) -(import: #long java/lang/Byte +(import: java/lang/Byte (#static MAX_VALUE byte) (#static MIN_VALUE byte)) -(import: #long java/lang/Short +(import: java/lang/Short (#static MAX_VALUE short) (#static MIN_VALUE short)) -- cgit v1.2.3