diff options
Diffstat (limited to 'new-luxc/source/luxc/lang/translation')
38 files changed, 88 insertions, 88 deletions
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp.lux b/new-luxc/source/luxc/lang/translation/common-lisp.lux index 360a230f9..a9ea2c215 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp.lux @@ -18,7 +18,7 @@ (host ["_" common-lisp #+ Expression])) [".C" io])) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] @@ -162,7 +162,7 @@ (function (_ compiler) (#e.Success [compiler (|> compiler (get@ #.host) (:coerce Host) (get@ #program-buffer))]))) -(do-template [<name> <field> <outputT>] +(template [<name> <field> <outputT>] [(def: (<name> code) (-> Expression (Meta <outputT>)) (function (_ compiler) diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux index 54b77e60d..9f918bdd5 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux @@ -32,7 +32,7 @@ (#e.Error error) (log! error))) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux index 45887cdae..437648fbb 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux @@ -21,7 +21,7 @@ [".T" case] [".T" procedure])) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux index b140a11eb..3eaa60821 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux @@ -142,7 +142,7 @@ )) ## [[Bits]] -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> paramO subjectO))] @@ -182,7 +182,7 @@ (#static MIN_VALUE Double) (#static MAX_VALUE Double)) -(do-template [<name> <const> <encode>] +(template [<name> <const> <encode>] [(def: (<name> _) Nullary (<encode> <const>))] @@ -192,7 +192,7 @@ [frac//max Double::MAX_VALUE _.double] ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (|> subjectO (<op> paramO)))] @@ -206,7 +206,7 @@ [int//< _.<] ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> paramO subjectO))] diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/host.jvm.lux index af82491b6..2793b40e8 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/host.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/host.jvm.lux @@ -14,7 +14,7 @@ (/// [".T" runtime]) (// ["@" common])) -## (do-template [<name> <lua>] +## (template [<name> <lua>] ## [(def: (<name> _) @.Nullary <lua>)] ## [lua//nil "nil"] diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux index 6d2a491c6..def77fc35 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux @@ -9,7 +9,7 @@ [//] (// [".T" runtime])) -(do-template [<register> <translation> <prefix>] +(template [<register> <translation> <prefix>] [(def: #export (<register> register) (-> Register SVar) (_.var (format <prefix> (%i (.int register))))) diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux index 1f06130e4..5fa6179c7 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux @@ -206,7 +206,7 @@ Runtime (_.progn (list @@bit//logical-right-shift))) -(do-template [<name> <top-cmp>] +(template [<name> <top-cmp>] [(def: (<name> top value) (-> Expression Expression Expression) (_.and (list (|> value (_.>= (_.int 0))) 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>)))] diff --git a/new-luxc/source/luxc/lang/translation/lua.lux b/new-luxc/source/luxc/lang/translation/lua.lux index e5272a3ea..e79af1048 100644 --- a/new-luxc/source/luxc/lang/translation/lua.lux +++ b/new-luxc/source/luxc/lang/translation/lua.lux @@ -18,7 +18,7 @@ (host [lua #+ Lua Expression Statement])) [".C" io])) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] diff --git a/new-luxc/source/luxc/lang/translation/lua/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/eval.jvm.lux index 18ae10e0a..17596ffa7 100644 --- a/new-luxc/source/luxc/lang/translation/lua/eval.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/lua/eval.jvm.lux @@ -11,7 +11,7 @@ (lang (host [lua #+ Lua Expression Statement]))) [//]) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] diff --git a/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux index 5d6b073fc..6597364bb 100644 --- a/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux @@ -22,7 +22,7 @@ [".T" case] [".T" procedure])) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] diff --git a/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux index 94337001e..2f1b652e3 100644 --- a/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux @@ -135,7 +135,7 @@ (loopT.translate-recur translate inputsS)))) ## [[Bits]] -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> paramO subjectO))] @@ -145,7 +145,7 @@ [bit//xor lua.bit-xor] ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> paramO subjectO))] @@ -163,7 +163,7 @@ (#static POSITIVE_INFINITY Double) (#static NEGATIVE_INFINITY Double)) -(do-template [<name> <const> <encode>] +(template [<name> <const> <encode>] [(def: (<name> _) Nullary (<encode> <const>))] @@ -173,7 +173,7 @@ [frac//max Double::MAX_VALUE lua.float] ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> paramO subjectO))] @@ -185,7 +185,7 @@ [int//rem lua.%] ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> paramO subjectO))] @@ -202,7 +202,7 @@ [text//< lua.<] ) -(do-template [<name> <cmp>] +(template [<name> <cmp>] [(def: (<name> [subjectO paramO]) Binary (<cmp> paramO subjectO))] @@ -220,7 +220,7 @@ (lux//try (lua.function (list) (lua.return! (lua.apply "tonumber" (list inputO)))))) -(do-template [<name> <divisor>] +(template [<name> <divisor>] [(def: (<name> inputO) Unary (lua./ <divisor> inputO))] @@ -228,7 +228,7 @@ [int//to-frac (lua.float 1.0)] ) -(do-template [<name> <transform>] +(template [<name> <transform>] [(def: (<name> inputO) Unary (|> inputO <transform>))] @@ -241,7 +241,7 @@ (|>> (list) (lua.apply "string.char"))) ## [[Text]] -(do-template [<name> <op>] +(template [<name> <op>] [(def: <name> Unary (|>> (list) (lua.apply <op>)))] @@ -257,7 +257,7 @@ Binary (runtimeT.text//char subjectO paramO)) -(do-template [<name> <runtime>] +(template [<name> <runtime>] [(def: (<name> [subjectO paramO extraO]) Trinary (<runtime> subjectO paramO extraO))] diff --git a/new-luxc/source/luxc/lang/translation/lua/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/procedure/host.jvm.lux index 2271d354a..f53f3ba05 100644 --- a/new-luxc/source/luxc/lang/translation/lua/procedure/host.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/lua/procedure/host.jvm.lux @@ -14,7 +14,7 @@ (/// [".T" runtime]) (// ["@" common])) -(do-template [<name> <lua>] +(template [<name> <lua>] [(def: (<name> _) @.Nullary <lua>)] [lua//nil "nil"] diff --git a/new-luxc/source/luxc/lang/translation/lua/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/reference.jvm.lux index fac6308a0..ea3f8e604 100644 --- a/new-luxc/source/luxc/lang/translation/lua/reference.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/lua/reference.jvm.lux @@ -9,7 +9,7 @@ [//] (// [".T" runtime])) -(do-template [<register> <translation> <prefix>] +(template [<register> <translation> <prefix>] [(def: #export (<register> register) (-> Register Expression) (format <prefix> (%i (.int register)))) diff --git a/new-luxc/source/luxc/lang/translation/php.lux b/new-luxc/source/luxc/lang/translation/php.lux index db0eeced4..0a694d3e6 100644 --- a/new-luxc/source/luxc/lang/translation/php.lux +++ b/new-luxc/source/luxc/lang/translation/php.lux @@ -19,7 +19,7 @@ (host ["_" php #+ Expression Statement])) [".C" io])) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] @@ -159,7 +159,7 @@ (function (_ compiler) (#e.Success [compiler (|> compiler (get@ #.host) (:coerce Host) (get@ #program-buffer))]))) -(do-template [<name> <field> <inputT> <outputT>] +(template [<name> <field> <inputT> <outputT>] [(def: (<name> code) (-> <inputT> (Meta <outputT>)) (function (_ compiler) diff --git a/new-luxc/source/luxc/lang/translation/php/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/php/eval.jvm.lux index 3bfd5578a..4c4a6c641 100644 --- a/new-luxc/source/luxc/lang/translation/php/eval.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/php/eval.jvm.lux @@ -12,7 +12,7 @@ (lang (host ["_" php #+ Expression Statement]))) [//]) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] diff --git a/new-luxc/source/luxc/lang/translation/php/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/php/expression.jvm.lux index 3d7d652bf..c49003c64 100644 --- a/new-luxc/source/luxc/lang/translation/php/expression.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/php/expression.jvm.lux @@ -22,7 +22,7 @@ [".T" procedure] )) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] diff --git a/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux index f77a35292..7a44accf2 100644 --- a/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux @@ -146,7 +146,7 @@ ## )) ## ## [[Bits]] -## (do-template [<name> <op>] +## (template [<name> <op>] ## [(def: (<name> [subjectO paramO]) ## Binary ## (<op> paramO subjectO))] @@ -161,7 +161,7 @@ ## (|> (_.bit-shl paramO subjectO) ## runtimeT.bit//64)) -## (do-template [<name> <op>] +## (template [<name> <op>] ## [(def: (<name> [subjectO paramO]) ## Binary ## (<op> paramO subjectO))] @@ -187,7 +187,7 @@ ## (#static MIN_VALUE Double) ## (#static MAX_VALUE Double)) -## (do-template [<name> <const> <encode>] +## (template [<name> <const> <encode>] ## [(def: (<name> _) ## Nullary ## (<encode> <const>))] @@ -197,7 +197,7 @@ ## [frac//max Double::MAX_VALUE _.float] ## ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (|> subjectO @@ -210,7 +210,7 @@ [int//% _.%] ) -## (do-template [<name> <op>] +## (template [<name> <op>] ## [(def: (<name> [subjectO paramO]) ## Binary ## (<op> paramO subjectO))] @@ -227,7 +227,7 @@ ## [text//< _.<] ## ) -(do-template [<name> <cmp>] +(template [<name> <cmp>] [(def: (<name> [subjectO paramO]) Binary (<cmp> paramO subjectO))] diff --git a/new-luxc/source/luxc/lang/translation/php/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/php/procedure/host.jvm.lux index af82491b6..2793b40e8 100644 --- a/new-luxc/source/luxc/lang/translation/php/procedure/host.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/php/procedure/host.jvm.lux @@ -14,7 +14,7 @@ (/// [".T" runtime]) (// ["@" common])) -## (do-template [<name> <lua>] +## (template [<name> <lua>] ## [(def: (<name> _) @.Nullary <lua>)] ## [lua//nil "nil"] diff --git a/new-luxc/source/luxc/lang/translation/php/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/php/reference.jvm.lux index 833fc5e5a..2415963d1 100644 --- a/new-luxc/source/luxc/lang/translation/php/reference.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/php/reference.jvm.lux @@ -9,7 +9,7 @@ [//] (// [".T" runtime])) -(do-template [<register> <prefix>] +(template [<register> <prefix>] [(def: #export <register> (-> Register Var) (|>> (:coerce Int) %i (format <prefix>) _.var))] @@ -27,7 +27,7 @@ (-> Name Var) (|>> //.definition-name _.var)) -(do-template [<name> <input> <converter>] +(template [<name> <input> <converter>] [(def: #export <name> (-> <input> (Meta Var)) (|>> <converter> (:: macro.Monad<Meta> wrap)))] diff --git a/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux index 3d5ea1775..7c4d9f444 100644 --- a/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux @@ -239,7 +239,7 @@ ## (def: inc (|>> (_.+ (_.int 1)))) -## (do-template [<name> <top-cmp>] +## (template [<name> <top-cmp>] ## [(def: (<name> top value) ## (-> Expression Expression Expression) ## (_.and (|> value (_.>= (_.int 0))) diff --git a/new-luxc/source/luxc/lang/translation/r.lux b/new-luxc/source/luxc/lang/translation/r.lux index a013bfd1c..d5a9f35fa 100644 --- a/new-luxc/source/luxc/lang/translation/r.lux +++ b/new-luxc/source/luxc/lang/translation/r.lux @@ -18,7 +18,7 @@ (host [r #+ Expression])) [".C" io])) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] @@ -161,7 +161,7 @@ (function (_ compiler) (#e.Success [compiler (|> compiler (get@ #.host) (:coerce Host) (get@ #program-buffer))]))) -(do-template [<name> <field> <outputT>] +(template [<name> <field> <outputT>] [(def: (<name> code) (-> Expression (Meta <outputT>)) (function (_ compiler) diff --git a/new-luxc/source/luxc/lang/translation/r/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/r/expression.jvm.lux index d838bc332..3c41fbe63 100644 --- a/new-luxc/source/luxc/lang/translation/r/expression.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/r/expression.jvm.lux @@ -22,7 +22,7 @@ [".T" procedure]) ) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] diff --git a/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux index 261e6cfb9..f806805c0 100644 --- a/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux @@ -147,7 +147,7 @@ )) ## [[Bits]] -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> paramO subjectO))] @@ -157,7 +157,7 @@ [bit//xor runtimeT.bit//xor] ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> (runtimeT.int64-low paramO) subjectO))] @@ -184,7 +184,7 @@ (#static MIN_VALUE Double) (#static MAX_VALUE Double)) -(do-template [<name> <const> <encode>] +(template [<name> <const> <encode>] [(def: (<name> _) Nullary (<encode> <const>))] @@ -194,7 +194,7 @@ [frac//max Double::MAX_VALUE r.float] ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (|> subjectO (<op> paramO)))] @@ -206,7 +206,7 @@ [int//rem runtimeT.int//%] ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> paramO subjectO))] @@ -223,7 +223,7 @@ [text//< r.<] ) -(do-template [<name> <cmp>] +(template [<name> <cmp>] [(def: (<name> [subjectO paramO]) Binary (<cmp> paramO subjectO))] diff --git a/new-luxc/source/luxc/lang/translation/r/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/r/procedure/host.jvm.lux index af82491b6..2793b40e8 100644 --- a/new-luxc/source/luxc/lang/translation/r/procedure/host.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/r/procedure/host.jvm.lux @@ -14,7 +14,7 @@ (/// [".T" runtime]) (// ["@" common])) -## (do-template [<name> <lua>] +## (template [<name> <lua>] ## [(def: (<name> _) @.Nullary <lua>)] ## [lua//nil "nil"] diff --git a/new-luxc/source/luxc/lang/translation/r/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/r/reference.jvm.lux index 087b87504..7de1c74ee 100644 --- a/new-luxc/source/luxc/lang/translation/r/reference.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/r/reference.jvm.lux @@ -9,7 +9,7 @@ [//] (// [".T" runtime])) -(do-template [<register> <translation> <prefix>] +(template [<register> <translation> <prefix>] [(def: #export (<register> register) (-> Register SVar) (r.var (format <prefix> (%i (.int register))))) diff --git a/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux index ce2265a8e..d641041d2 100644 --- a/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux @@ -163,7 +163,7 @@ (r.named-list (list [//.int-high-field (as-integer (@@ high))] [//.int-low-field (as-integer (@@ low))]))) -(do-template [<name> <value>] +(template [<name> <value>] [(runtime: <name> (..int <value>))] @@ -597,7 +597,7 @@ @@sum//get )) -(do-template [<name> <op>] +(template [<name> <op>] [(runtime: (<name> mask input) (int//new (<op> (int64-high (@@ mask)) (int64-high (@@ input))) @@ -659,7 +659,7 @@ (def: inc (-> Expression Expression) (|>> (r.+ (r.int 1)))) -(do-template [<name> <top-cmp>] +(template [<name> <top-cmp>] [(def: (<name> top value) (-> Expression Expression Expression) (|> (|> value (r.>= (r.int 0))) diff --git a/new-luxc/source/luxc/lang/translation/ruby.lux b/new-luxc/source/luxc/lang/translation/ruby.lux index 501e8e2c1..084c614ec 100644 --- a/new-luxc/source/luxc/lang/translation/ruby.lux +++ b/new-luxc/source/luxc/lang/translation/ruby.lux @@ -18,7 +18,7 @@ (host [ruby #+ Ruby Expression Statement])) [".C" io])) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] diff --git a/new-luxc/source/luxc/lang/translation/ruby/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/eval.jvm.lux index 52a261b2a..3742ae467 100644 --- a/new-luxc/source/luxc/lang/translation/ruby/eval.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/ruby/eval.jvm.lux @@ -11,7 +11,7 @@ (lang (host [ruby #+ Ruby Expression Statement]))) [//]) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] diff --git a/new-luxc/source/luxc/lang/translation/ruby/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/expression.jvm.lux index 6023f3a82..3016836b9 100644 --- a/new-luxc/source/luxc/lang/translation/ruby/expression.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/ruby/expression.jvm.lux @@ -21,7 +21,7 @@ [".T" case] [".T" procedure])) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] diff --git a/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux index 9176879b1..c60938d79 100644 --- a/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux @@ -145,7 +145,7 @@ )) ## [[Bits]] -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> paramO subjectO))] @@ -160,7 +160,7 @@ (ruby.bit-and "0xFFFFFFFFFFFFFFFF" (ruby.bit-shl paramO subjectO))) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> paramO subjectO))] @@ -186,7 +186,7 @@ (#static MIN_VALUE Double) (#static MAX_VALUE Double)) -(do-template [<name> <const> <encode>] +(template [<name> <const> <encode>] [(def: (<name> _) Nullary (<encode> <const>))] @@ -196,7 +196,7 @@ [frac//max Double::MAX_VALUE ruby.float] ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (ruby.bit-and "0xFFFFFFFFFFFFFFFF" @@ -207,7 +207,7 @@ [int//mul ruby.*] ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> paramO subjectO))] @@ -216,7 +216,7 @@ [int//rem ruby.%] ) -(do-template [<name> <op>] +(template [<name> <op>] [(def: (<name> [subjectO paramO]) Binary (<op> paramO subjectO))] @@ -233,7 +233,7 @@ [text//< ruby.<] ) -(do-template [<name> <cmp>] +(template [<name> <cmp>] [(def: (<name> [subjectO paramO]) Binary (<cmp> paramO subjectO))] @@ -291,7 +291,7 @@ (install "decode" (unary frac//decode))))) ## [[Text]] -(do-template [<name> <op>] +(template [<name> <op>] [(def: <name> Unary (ruby.send <op> (list)))] diff --git a/new-luxc/source/luxc/lang/translation/ruby/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/procedure/host.jvm.lux index af82491b6..2793b40e8 100644 --- a/new-luxc/source/luxc/lang/translation/ruby/procedure/host.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/ruby/procedure/host.jvm.lux @@ -14,7 +14,7 @@ (/// [".T" runtime]) (// ["@" common])) -## (do-template [<name> <lua>] +## (template [<name> <lua>] ## [(def: (<name> _) @.Nullary <lua>)] ## [lua//nil "nil"] diff --git a/new-luxc/source/luxc/lang/translation/ruby/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/reference.jvm.lux index fb206b127..80e78951b 100644 --- a/new-luxc/source/luxc/lang/translation/ruby/reference.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/ruby/reference.jvm.lux @@ -9,7 +9,7 @@ [//] (// [".T" runtime])) -(do-template [<register> <translation> <prefix>] +(template [<register> <translation> <prefix>] [(def: #export (<register> register) (-> Register Expression) (format <prefix> (%i (.int register)))) diff --git a/new-luxc/source/luxc/lang/translation/scheme.lux b/new-luxc/source/luxc/lang/translation/scheme.lux index 7d261ca04..e509cb8ca 100644 --- a/new-luxc/source/luxc/lang/translation/scheme.lux +++ b/new-luxc/source/luxc/lang/translation/scheme.lux @@ -18,7 +18,7 @@ (host [scheme #+ Expression])) [".C" io])) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] @@ -164,7 +164,7 @@ (function (_ compiler) (#e.Success [compiler (|> compiler (get@ #.host) (:coerce Host) (get@ #program-buffer))]))) -(do-template [<name> <field> <outputT>] +(template [<name> <field> <outputT>] [(def: (<name> code) (-> Expression (Meta <outputT>)) (function (_ compiler) diff --git a/new-luxc/source/luxc/lang/translation/scheme/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/scheme/eval.jvm.lux index ae4a4151a..db9b25129 100644 --- a/new-luxc/source/luxc/lang/translation/scheme/eval.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/scheme/eval.jvm.lux @@ -13,7 +13,7 @@ (lang (host [scheme #+ Expression]))) [//]) -(do-template [<name>] +(template [<name>] [(exception: #export (<name> {message Text}) message)] |