aboutsummaryrefslogtreecommitdiff
path: root/new-luxc/source/luxc/lang/host
diff options
context:
space:
mode:
Diffstat (limited to 'new-luxc/source/luxc/lang/host')
-rw-r--r--new-luxc/source/luxc/lang/host/common-lisp.lux18
-rw-r--r--new-luxc/source/luxc/lang/host/jvm.lux2
-rw-r--r--new-luxc/source/luxc/lang/host/jvm/def.lux4
-rw-r--r--new-luxc/source/luxc/lang/host/jvm/inst.lux14
-rw-r--r--new-luxc/source/luxc/lang/host/jvm/type.lux2
-rw-r--r--new-luxc/source/luxc/lang/host/lua.lux6
-rw-r--r--new-luxc/source/luxc/lang/host/php.lux20
-rw-r--r--new-luxc/source/luxc/lang/host/r.lux10
-rw-r--r--new-luxc/source/luxc/lang/host/ruby.lux6
9 files changed, 41 insertions, 41 deletions
diff --git a/new-luxc/source/luxc/lang/host/common-lisp.lux b/new-luxc/source/luxc/lang/host/common-lisp.lux
index 2acc52700..50a942636 100644
--- a/new-luxc/source/luxc/lang/host/common-lisp.lux
+++ b/new-luxc/source/luxc/lang/host/common-lisp.lux
@@ -102,7 +102,7 @@
(-> Text Expression)
(|>> %t :abstraction))
- (do-template [<name> <prefix>]
+ (template [<name> <prefix>]
[(def: #export <name>
(-> Text Expression)
(|>> (format <prefix>) :abstraction))]
@@ -127,7 +127,7 @@
(-> Expression (List Expression) Expression)
(form (#.Cons func args)))
- (do-template [<name> <function>]
+ (template [<name> <function>]
[(def: #export <name>
(-> (List Expression) Expression)
($apply (..global <function>)))]
@@ -156,7 +156,7 @@
(-> Expression (-> Expression Expression))
(|>> (.list) (..$apply func)))
- (do-template [<lux-name> <scheme-name>]
+ (template [<lux-name> <scheme-name>]
[(def: #export <lux-name> (..$apply1 (..global <scheme-name>)))]
[length "length"]
@@ -204,7 +204,7 @@
(.function (_ _0 _1)
(..$apply func (.list _0 _1))))
- (do-template [<lux-name> <scheme-name>]
+ (template [<lux-name> <scheme-name>]
[(def: #export <lux-name> (..$apply2 (..global <scheme-name>)))]
[append "append"]
@@ -224,7 +224,7 @@
(.function (_ _0 _1 _2)
(..$apply func (.list _0 _1 _2))))
- (do-template [<lux-name> <scheme-name>]
+ (template [<lux-name> <scheme-name>]
[(def: #export <lux-name> ($apply3 (..global <scheme-name>)))]
[subseq/3 "subseq"]
@@ -237,7 +237,7 @@
(-> Expression Expression Expression)
(concatenate/3 (..symbol "string")))
- (do-template [<lux-name> <scheme-name>]
+ (template [<lux-name> <scheme-name>]
[(def: #export <lux-name>
(-> (List Expression) Expression)
(|>> (.list& (..global <scheme-name>)) ..form))]
@@ -246,7 +246,7 @@
[and "and"]
)
- (do-template [<lux-name> <scheme-name>]
+ (template [<lux-name> <scheme-name>]
[(def: #export (<lux-name> param subject)
(-> Expression Expression Expression)
(..form (.list (..global <scheme-name>) subject param)))]
@@ -273,7 +273,7 @@
[logxor "logxor"]
)
- (do-template [<lux-name> <scheme-name>]
+ (template [<lux-name> <scheme-name>]
[(def: #export (<lux-name> bindings body)
(-> (List [SVar Expression]) Expression Expression)
(..form (.list (..global <scheme-name>)
@@ -342,7 +342,7 @@
handler)))
handlers))))
- (do-template [<name> <prefix>]
+ (template [<name> <prefix>]
[(def: #export (<name> conditions expression)
(-> (List Text) Expression Expression)
(case conditions
diff --git a/new-luxc/source/luxc/lang/host/jvm.lux b/new-luxc/source/luxc/lang/host/jvm.lux
index 32a24452d..71e887d4d 100644
--- a/new-luxc/source/luxc/lang/host/jvm.lux
+++ b/new-luxc/source/luxc/lang/host/jvm.lux
@@ -96,7 +96,7 @@
(type: #export Host
(translation.Host Inst Definition))
-(do-template [<name> <base>]
+(template [<name> <base>]
[(type: #export <name>
(<base> ..Anchor Inst Definition))]
diff --git a/new-luxc/source/luxc/lang/host/jvm/def.lux b/new-luxc/source/luxc/lang/host/jvm/def.lux
index db6bfe07b..f9b6e5c2d 100644
--- a/new-luxc/source/luxc/lang/host/jvm/def.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/def.lux
@@ -154,7 +154,7 @@
## (ClassWriter::COMPUTE_FRAMES)
))
-(do-template [<name> <flag>]
+(template [<name> <flag>]
[(def: #export (<name> version visibility config name parameters super interfaces
definitions)
(-> $.Version $.Visibility $.Class-Config Text (List $.Parameter) $.Class (List $.Class) $.Def
@@ -251,7 +251,7 @@
(FieldVisitor::visitEnd))]
writer)))
-(do-template [<name> <lux-type> <jvm-type> <prepare>]
+(template [<name> <lux-type> <jvm-type> <prepare>]
[(def: #export (<name> visibility config name value)
(-> $.Visibility $.Field-Config Text <lux-type> $.Def)
(function (_ writer)
diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux
index 5311f39d9..36a020686 100644
--- a/new-luxc/source/luxc/lang/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux
@@ -127,7 +127,7 @@
(-> (-> Label Inst) Inst)
(action (Label::new)))
-(do-template [<name> <type> <prepare>]
+(template [<name> <type> <prepare>]
[(def: #export (<name> value)
(-> <type> Inst)
(function (_ visitor)
@@ -151,7 +151,7 @@
(do-to visitor
(MethodVisitor::visitInsn (prefix ACONST_NULL)))))
-(do-template [<name>]
+(template [<name>]
[(def: #export <name>
Inst
(function (_ visitor)
@@ -212,7 +212,7 @@
[RETURN] [IRETURN] [LRETURN] [DRETURN] [ARETURN]
)
-(do-template [<name>]
+(template [<name>]
[(def: #export (<name> register)
(-> Nat Inst)
(function (_ visitor)
@@ -223,7 +223,7 @@
[ISTORE] [LSTORE] [ASTORE]
)
-(do-template [<name> <inst>]
+(template [<name> <inst>]
[(def: #export (<name> class field type)
(-> Text Text //.Type Inst)
(function (_ visitor)
@@ -237,7 +237,7 @@
[GETFIELD Opcodes::GETFIELD]
)
-(do-template [<name> <inst>]
+(template [<name> <inst>]
[(def: #export (<name> class)
(-> Text Inst)
(function (_ visitor)
@@ -265,7 +265,7 @@
#//.Double (Opcodes::T_DOUBLE)
#//.Char (Opcodes::T_CHAR))))))
-(do-template [<name> <inst>]
+(template [<name> <inst>]
[(def: #export (<name> class method-name method-signature interface?)
(-> Text Text //.Method Bit Inst)
(function (_ visitor)
@@ -278,7 +278,7 @@
[INVOKEINTERFACE Opcodes::INVOKEINTERFACE]
)
-(do-template [<name>]
+(template [<name>]
[(def: #export (<name> @where)
(-> //.Label Inst)
(function (_ visitor)
diff --git a/new-luxc/source/luxc/lang/host/jvm/type.lux b/new-luxc/source/luxc/lang/host/jvm/type.lux
index 523944b44..72a1925b4 100644
--- a/new-luxc/source/luxc/lang/host/jvm/type.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/type.lux
@@ -8,7 +8,7 @@
["." //])
## Types
-(do-template [<name> <primitive>]
+(template [<name> <primitive>]
[(def: #export <name> //.Type (#//.Primitive <primitive>))]
[boolean #//.Boolean]
diff --git a/new-luxc/source/luxc/lang/host/lua.lux b/new-luxc/source/luxc/lang/host/lua.lux
index ec2fa8928..364c05052 100644
--- a/new-luxc/source/luxc/lang/host/lua.lux
+++ b/new-luxc/source/luxc/lang/host/lua.lux
@@ -144,7 +144,7 @@
(text.join-with ", "))
"}"))
-(do-template [<name> <op>]
+(template [<name> <op>]
[(def: #export (<name> param subject)
(-> Expression Expression Expression)
(format "(" subject " " <op> " " param ")"))]
@@ -162,7 +162,7 @@
[% "%"]
)
-(do-template [<name> <op>]
+(template [<name> <op>]
[(def: #export (<name> param subject)
(-> Expression Expression Expression)
(format "(" param " " <op> " " subject ")"))]
@@ -174,7 +174,7 @@
[bit-xor "~"]
)
-(do-template [<name> <op>]
+(template [<name> <op>]
[(def: #export (<name> param subject)
(-> Expression Expression Expression)
(format "(" subject " " <op> " " param ")"))]
diff --git a/new-luxc/source/luxc/lang/host/php.lux b/new-luxc/source/luxc/lang/host/php.lux
index 6ab97ee52..878bbaa18 100644
--- a/new-luxc/source/luxc/lang/host/php.lux
+++ b/new-luxc/source/luxc/lang/host/php.lux
@@ -56,7 +56,7 @@
(text.join-with ", ")
(text.enclose ["(" ")"])))
- (do-template [<name> <reference?>]
+ (template [<name> <reference?>]
[(def: #export <name>
(-> Var Argument)
(|>> [<reference?>]))]
@@ -127,7 +127,7 @@
" " uses " "
(block (:representation body))))))
- (do-template [<name> <function>]
+ (template [<name> <function>]
[(def: #export <name>
Computation
(..apply (list) (..global <function>)))]
@@ -136,7 +136,7 @@
[func-get-args/0 "func_get_args"]
)
- (do-template [<name> <function>]
+ (template [<name> <function>]
[(def: #export (<name> values)
(-> (List Expression) Computation)
(..apply values (..global <function>)))]
@@ -144,7 +144,7 @@
[array/* "array"]
)
- (do-template [<name> <function>]
+ (template [<name> <function>]
[(def: #export (<name> required optionals)
(-> Expression (List Expression) Computation)
(..apply (list& required optionals) (..global <function>)))]
@@ -162,7 +162,7 @@
(text.join-with ", "))
")")))
- (do-template [<name> <function>]
+ (template [<name> <function>]
[(def: #export (<name> input0)
(-> Expression Computation)
(..apply (list input0) (..global <function>)))]
@@ -174,7 +174,7 @@
[floatval/1 "floatval"]
)
- (do-template [<name> <function>]
+ (template [<name> <function>]
[(def: #export (<name> input0 input1)
(-> Expression Expression Computation)
(..apply (list input0 input1) (..global <function>)))]
@@ -184,7 +184,7 @@
[array-push/2 "array_push"]
)
- (do-template [<name> <function>]
+ (template [<name> <function>]
[(def: #export (<name> input0 input1 input2)
(-> Expression Expression Expression Computation)
(..apply (list input0 input1 input2) (..global <function>)))]
@@ -213,7 +213,7 @@
(:representation then) " : "
(:representation else))))
- (do-template [<name> <op>]
+ (template [<name> <op>]
[(def: #export (<name> param subject)
(-> Expression Expression Computation)
(computation
@@ -244,7 +244,7 @@
(-> Computation Computation)
(|>> :representation (format "!") :abstraction))
- (do-template [<name> <type> <constructor>]
+ (template [<name> <type> <constructor>]
[(def: #export (<name> var value)
(-> Var Expression <type>)
(<constructor> (format (:representation var) " = " (:representation value))))]
@@ -317,7 +317,7 @@
(format "try " (block (:representation body!)) "\n"
(|> excepts (list/map catch!) (text.join-with "\n")))))
- (do-template [<name> <keyword>]
+ (template [<name> <keyword>]
[(def: #export (<name> message)
(-> Expression Statement)
(statement (format <keyword> " " (:representation message))))]
diff --git a/new-luxc/source/luxc/lang/host/r.lux b/new-luxc/source/luxc/lang/host/r.lux
index 8cd802df9..6e4c7fb5b 100644
--- a/new-luxc/source/luxc/lang/host/r.lux
+++ b/new-luxc/source/luxc/lang/host/r.lux
@@ -109,7 +109,7 @@
(composite-literal "list(" ")" (.function (_ [key value])
(format key "=" (:representation value)))))
- (do-template [<name> <function>]
+ (template [<name> <function>]
[(def: #export <name>
(-> (List Expression) Expression)
(composite-literal (format <function> "(") ")" expression))]
@@ -172,7 +172,7 @@
else
(list.reverse clauses)))
- (do-template [<name> <op>]
+ (template [<name> <op>]
[(def: #export (<name> param subject)
(-> Expression Expression Expression)
(self-contained
@@ -203,7 +203,7 @@
(-> Text Expression)
(|>> var @@))
- (do-template [<name> <func>]
+ (template [<name> <func>]
[(def: #export (<name> param subject)
(-> Expression Expression Expression)
(..apply (.list subject param) (..global <func>)))]
@@ -219,7 +219,7 @@
(-> Expression Expression)
(..apply (.list subject) (..global "bitwNot")))
- (do-template [<name> <op>]
+ (template [<name> <op>]
[(def: #export <name>
(-> Expression Expression)
(|>> :representation (format <op>) self-contained))]
@@ -271,7 +271,7 @@
(format "for (" (..name var) " in " (..expression inputs) ")"
(.._block (:representation body)))))
- (do-template [<name> <keyword>]
+ (template [<name> <keyword>]
[(def: #export (<name> message)
(-> Expression Expression)
(..apply (.list message) (..global <keyword>)))]
diff --git a/new-luxc/source/luxc/lang/host/ruby.lux b/new-luxc/source/luxc/lang/host/ruby.lux
index 61e945af0..61c0f8bb5 100644
--- a/new-luxc/source/luxc/lang/host/ruby.lux
+++ b/new-luxc/source/luxc/lang/host/ruby.lux
@@ -179,7 +179,7 @@
(#.Some name)
(format "(" name " = " proc ")"))))
-(do-template [<name> <op>]
+(template [<name> <op>]
[(def: #export (<name> param subject)
(-> Expression Expression Expression)
(format "(" subject " " <op> " " param ")"))]
@@ -197,7 +197,7 @@
[pow "**"]
)
-(do-template [<name> <op>]
+(template [<name> <op>]
[(def: #export (<name> param subject)
(-> Expression Expression Expression)
(format "(" param " " <op> " " subject ")"))]
@@ -209,7 +209,7 @@
[bit-xor "^"]
)
-(do-template [<name> <op>]
+(template [<name> <op>]
[(def: #export (<name> param subject)
(-> Expression Expression Expression)
(format "(" subject " " <op> " " param ")"))]