diff options
Diffstat (limited to 'new-luxc/source/luxc/lang/translation/jvm')
4 files changed, 18 insertions, 18 deletions
diff --git a/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux index 628edff49..e514fe28a 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux @@ -21,7 +21,7 @@ (if value "TRUE" "FALSE") ($t.class "java.lang.Boolean" (list))))) -(do-template [<name> <type> <load> <wrap>] +(template [<name> <type> <load> <wrap>] [(def: #export (<name> value) (-> <type> (Operation Inst)) (let [loadI (|> value <load>)] diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux index 55cf8a644..faec813e9 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux @@ -118,7 +118,7 @@ #0))) ### Bits -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [maskI inputI]) Binary (|>> inputI (_.unwrap #$.Long) @@ -130,7 +130,7 @@ [bit::xor _.LXOR] ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [shiftI inputI]) Binary (|>> inputI (_.unwrap #$.Long) @@ -144,7 +144,7 @@ ) ### Numbers -(do-template [<name> <const> <type>] +(template [<name> <const> <type>] [(def: (<name> _) Nullary (|>> <const> (_.wrap <type>)))] @@ -154,7 +154,7 @@ [frac::max (_.double (Double::MAX_VALUE)) #$.Double] ) -(do-template [<name> <type> <op>] +(template [<name> <type> <op>] [(def: (<name> [subjectI paramI]) Binary (|>> subjectI (_.unwrap <type>) @@ -175,8 +175,8 @@ [frac::% #$.Double _.DREM] ) -(do-template [<eq> <lt> <unwrap> <cmp>] - [(do-template [<name> <reference>] +(template [<eq> <lt> <unwrap> <cmp>] + [(template [<name> <reference>] [(def: (<name> [subjectI paramI]) Binary (|>> subjectI <unwrap> @@ -192,7 +192,7 @@ [frac::= frac::< (_.unwrap #$.Double) _.DCMPG] ) -(do-template [<name> <prepare> <transform>] +(template [<name> <prepare> <transform>] [(def: (<name> inputI) Unary (|>> inputI <prepare> <transform>))] @@ -216,7 +216,7 @@ (_.INVOKEVIRTUAL "java.lang.String" "length" (_t.method (list) (#.Some _t.int) (list)) #0) lux-intI)) -(do-template [<name> <pre-subject> <pre-param> <op> <post>] +(template [<name> <pre-subject> <pre-param> <op> <post>] [(def: (<name> [subjectI paramI]) Binary (|>> subjectI <pre-subject> @@ -237,7 +237,7 @@ lux-intI] ) -(do-template [<name> <pre-subject> <pre-param> <pre-extra> <op>] +(template [<name> <pre-subject> <pre-param> <pre-extra> <op>] [(def: (<name> [subjectI paramI extraI]) Trinary (|>> subjectI <pre-subject> diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/host.jvm.lux index 483f810e2..624af7ed8 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/procedure/host.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/host.jvm.lux @@ -25,7 +25,7 @@ ["ls" synthesis])) (// ["@" common])) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] @@ -33,7 +33,7 @@ [Invalid-Syntax-For-Argument-Generation] ) -(do-template [<name> <inst>] +(template [<name> <inst>] [(def: <name> $.Inst <inst>)] @@ -43,7 +43,7 @@ [L2C (|>> _.L2I _.I2C)] ) -(do-template [<name> <unwrap> <conversion> <wrap>] +(template [<name> <unwrap> <conversion> <wrap>] [(def: (<name> inputI) @.Unary (if (is? _.NOP <conversion>) @@ -111,7 +111,7 @@ (@.install "short-to-long" (@.unary convert//short-to-long)) ))) -(do-template [<name> <op> <unwrapX> <unwrapY> <wrap>] +(template [<name> <op> <unwrapX> <unwrapY> <wrap>] [(def: (<name> [xI yI]) @.Binary (|>> xI (_.unwrap <unwrapX>) @@ -159,7 +159,7 @@ (def: falseI (_.GETSTATIC "java.lang.Boolean" "FALSE" boolean-class)) (def: trueI (_.GETSTATIC "java.lang.Boolean" "TRUE" boolean-class)) -(do-template [<name> <op> <unwrapX> <unwrapY> <wrap>] +(template [<name> <op> <unwrapX> <unwrapY> <wrap>] [(def: (<name> [xI yI]) @.Binary (<| _.with-label (function (_ @then)) @@ -180,7 +180,7 @@ [char//< _.IF_ICMPLT #$.Char #$.Char #$.Boolean] ) -(do-template [<name> <op> <reference> <unwrapX> <unwrapY> <wrap>] +(template [<name> <op> <reference> <unwrapX> <unwrapY> <wrap>] [(def: (<name> [xI yI]) @.Binary (<| _.with-label (function (_ @then)) @@ -684,7 +684,7 @@ _ (&.throw @.Wrong-Syntax (@.wrong-syntax proc inputs)))) -(do-template [<name> <invoke> <interface?>] +(template [<name> <invoke> <interface?>] [(def: (<name> proc translate inputs) (-> Text @.Proc) (case inputs diff --git a/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux index fe4a58b36..0a354a929 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux @@ -19,7 +19,7 @@ ["_" inst]]]]] ["." //]) -(do-template [<name> <prefix>] +(template [<name> <prefix>] [(def: #export (<name> idx) (-> Nat Text) (|> idx %n (format <prefix>)))] |