diff options
Diffstat (limited to '')
19 files changed, 45 insertions, 53 deletions
diff --git a/new-luxc/test/test/luxc/generator/case.lux b/new-luxc/test/test/luxc/generator/case.lux index cfbe31de8..7763cd852 100644 --- a/new-luxc/test/test/luxc/generator/case.lux +++ b/new-luxc/test/test/luxc/generator/case.lux @@ -11,7 +11,6 @@ (meta [code]) test) (luxc (lang ["ls" synthesis]) - [analyser] [synthesizer] (generator ["@" case] [";G" expression] diff --git a/new-luxc/test/test/luxc/generator/function.lux b/new-luxc/test/test/luxc/generator/function.lux index 5620996b5..e7a0e7d61 100644 --- a/new-luxc/test/test/luxc/generator/function.lux +++ b/new-luxc/test/test/luxc/generator/function.lux @@ -14,7 +14,6 @@ [host] test) (luxc (lang ["ls" synthesis]) - [analyser] [synthesizer] (generator [";G" expression] ["@;" eval] diff --git a/new-luxc/test/test/luxc/generator/primitive.lux b/new-luxc/test/test/luxc/generator/primitive.lux index 84f47f146..6de14d0e5 100644 --- a/new-luxc/test/test/luxc/generator/primitive.lux +++ b/new-luxc/test/test/luxc/generator/primitive.lux @@ -13,7 +13,6 @@ test) (luxc [";L" host] (lang ["ls" synthesis]) - [analyser] [synthesizer] (generator [";G" expression] ["@;" runtime] diff --git a/new-luxc/test/test/luxc/generator/procedure/common.jvm.lux b/new-luxc/test/test/luxc/generator/procedure/common.jvm.lux index 79829672d..5e3c07bea 100644 --- a/new-luxc/test/test/luxc/generator/procedure/common.jvm.lux +++ b/new-luxc/test/test/luxc/generator/procedure/common.jvm.lux @@ -17,7 +17,6 @@ [host] test) (luxc (lang ["ls" synthesis]) - [analyser] [synthesizer] (generator [";G" expression] ["@;" eval] diff --git a/new-luxc/test/test/luxc/generator/procedure/host.jvm.lux b/new-luxc/test/test/luxc/generator/procedure/host.jvm.lux index 8db98ed37..d571c578b 100644 --- a/new-luxc/test/test/luxc/generator/procedure/host.jvm.lux +++ b/new-luxc/test/test/luxc/generator/procedure/host.jvm.lux @@ -18,7 +18,6 @@ test) (luxc [";L" host] (lang ["ls" synthesis]) - [analyser] [synthesizer] (generator [";G" expression] ["@;" eval] diff --git a/new-luxc/test/test/luxc/generator/structure.lux b/new-luxc/test/test/luxc/generator/structure.lux index 9143ba5c8..37320fa99 100644 --- a/new-luxc/test/test/luxc/generator/structure.lux +++ b/new-luxc/test/test/luxc/generator/structure.lux @@ -17,7 +17,6 @@ test) (luxc [";L" host] (lang ["ls" synthesis]) - [analyser] [synthesizer] (generator [";G" expression] ["@;" eval] diff --git a/new-luxc/test/test/luxc/analyser/case.lux b/new-luxc/test/test/luxc/lang/analysis/case.lux index 27cc9f6ae..66646754e 100644 --- a/new-luxc/test/test/luxc/analyser/case.lux +++ b/new-luxc/test/test/luxc/lang/analysis/case.lux @@ -18,10 +18,10 @@ (type ["tc" check])) test) (luxc ["&" base] - (lang ["la" analysis]) - [analyser] - (analyser ["@" case] - ["@;" common]) + (lang ["la" analysis] + (analysis [";A" expression] + ["@" case] + ["@;" common])) ["@;" module]) (.. common) (test/luxc common)) diff --git a/new-luxc/test/test/luxc/analyser/common.lux b/new-luxc/test/test/luxc/lang/analysis/common.lux index 99090777b..937ed4cda 100644 --- a/new-luxc/test/test/luxc/analyser/common.lux +++ b/new-luxc/test/test/luxc/lang/analysis/common.lux @@ -6,7 +6,7 @@ [meta] (meta [code])) (luxc ["&" base] - [analyser] + (lang (analysis [";A" expression])) [eval]) (test/luxc common)) @@ -34,7 +34,7 @@ (def: #export analyse &;Analyser - (analyser;analyser eval;eval)) + (expressionA;analyser eval;eval)) (do-template [<name> <on-success> <on-failure>] [(def: #export (<name> analysis) diff --git a/new-luxc/test/test/luxc/analyser/function.lux b/new-luxc/test/test/luxc/lang/analysis/function.lux index 379c4acf4..1a2f13458 100644 --- a/new-luxc/test/test/luxc/analyser/function.lux +++ b/new-luxc/test/test/luxc/lang/analysis/function.lux @@ -15,10 +15,10 @@ [type "type/" Eq<Type>]) test) (luxc ["&" base] - (lang ["la" analysis]) - [analyser] - (analyser ["@" function] - ["@;" common]) + (lang ["la" analysis] + (analysis [";A" expression] + ["@" function] + ["@;" common])) ["@;" module]) (.. common) (test/luxc common)) diff --git a/new-luxc/test/test/luxc/analyser/primitive.lux b/new-luxc/test/test/luxc/lang/analysis/primitive.lux index 8c483428b..41dc9fada 100644 --- a/new-luxc/test/test/luxc/analyser/primitive.lux +++ b/new-luxc/test/test/luxc/lang/analysis/primitive.lux @@ -18,10 +18,10 @@ test) (luxc ["&" base] ["&;" module] - (lang ["~" analysis]) - [analyser] - (analyser ["@" primitive] - ["@;" common])) + (lang ["~" analysis] + (analysis [";A" expression] + ["@" primitive] + ["@;" common]))) (.. common) (test/luxc common)) diff --git a/new-luxc/test/test/luxc/analyser/procedure/common.lux b/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux index 5e1619d38..134421732 100644 --- a/new-luxc/test/test/luxc/analyser/procedure/common.lux +++ b/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux @@ -17,10 +17,10 @@ ["&;" scope] ["&;" module] [";L" eval] - (lang ["~" analysis]) - [analyser] - (analyser ["@" procedure] - ["@;" common])) + (lang ["~" analysis] + (analysis [";A" expression] + ["@" procedure] + ["@;" common]))) (../.. common) (test/luxc common)) diff --git a/new-luxc/test/test/luxc/analyser/procedure/host.jvm.lux b/new-luxc/test/test/luxc/lang/analysis/procedure/host.jvm.lux index 3cee1b160..333a60353 100644 --- a/new-luxc/test/test/luxc/analyser/procedure/host.jvm.lux +++ b/new-luxc/test/test/luxc/lang/analysis/procedure/host.jvm.lux @@ -21,11 +21,11 @@ ["&;" scope] ["&;" module] [";L" eval] - (lang ["~" analysis]) - [analyser] - (analyser ["@" procedure] - ["@;" common] - (procedure ["@;" host])) + (lang ["~" analysis] + (analysis [";A" expression] + ["@;" common] + ["@" procedure] + (procedure ["@;" host]))) (generator ["@;" runtime])) (../.. common) (test/luxc common)) diff --git a/new-luxc/test/test/luxc/analyser/reference.lux b/new-luxc/test/test/luxc/lang/analysis/reference.lux index e9d66838a..f6021e184 100644 --- a/new-luxc/test/test/luxc/analyser/reference.lux +++ b/new-luxc/test/test/luxc/lang/analysis/reference.lux @@ -10,10 +10,10 @@ test) (luxc ["&;" scope] ["&;" module] - (lang ["~" analysis]) - [analyser] - (analyser ["@" reference] - ["@;" common])) + (lang ["~" analysis] + (analysis [";A" expression] + ["@" reference] + ["@;" common]))) (.. common) (test/luxc common)) diff --git a/new-luxc/test/test/luxc/analyser/structure.lux b/new-luxc/test/test/luxc/lang/analysis/structure.lux index 5f88aea37..507b61995 100644 --- a/new-luxc/test/test/luxc/analyser/structure.lux +++ b/new-luxc/test/test/luxc/lang/analysis/structure.lux @@ -18,10 +18,10 @@ (type ["tc" check])) test) (luxc ["&" base] - (lang ["la" analysis]) - [analyser] - (analyser ["@" structure] - ["@;" common]) + (lang ["la" analysis] + (analysis [";A" expression] + ["@" structure] + ["@;" common])) ["@;" module]) (.. common) (test/luxc common)) diff --git a/new-luxc/test/test/luxc/analyser/type.lux b/new-luxc/test/test/luxc/lang/analysis/type.lux index 978e450b6..649c33fef 100644 --- a/new-luxc/test/test/luxc/analyser/type.lux +++ b/new-luxc/test/test/luxc/lang/analysis/type.lux @@ -18,10 +18,10 @@ test) (luxc ["&" base] ["&;" module] - (lang ["~" analysis]) - [analyser] - (analyser ["@" type] - ["@;" common]) + (lang ["~" analysis] + (analysis [";A" expression] + ["@" type] + ["@;" common])) (generator ["@;" runtime]) [eval]) (.. common) diff --git a/new-luxc/test/test/luxc/parser.lux b/new-luxc/test/test/luxc/lang/parser.lux index 33a0bc154..c70bdaece 100644 --- a/new-luxc/test/test/luxc/parser.lux +++ b/new-luxc/test/test/luxc/lang/parser.lux @@ -11,7 +11,7 @@ ["r" math/random "r/" Monad<Random>] (meta [code]) test) - (luxc ["&" parser])) + (luxc (lang ["&" parser]))) (def: default-cursor Cursor diff --git a/new-luxc/test/test/luxc/synthesizer/primitive.lux b/new-luxc/test/test/luxc/synthesizer/primitive.lux index fb37f6104..2a1490193 100644 --- a/new-luxc/test/test/luxc/synthesizer/primitive.lux +++ b/new-luxc/test/test/luxc/synthesizer/primitive.lux @@ -9,7 +9,6 @@ test) (luxc (lang ["la" analysis] ["ls" synthesis]) - [analyser] [synthesizer])) (context: "Primitives" diff --git a/new-luxc/test/test/luxc/synthesizer/procedure.lux b/new-luxc/test/test/luxc/synthesizer/procedure.lux index 68010adeb..c659c5e34 100644 --- a/new-luxc/test/test/luxc/synthesizer/procedure.lux +++ b/new-luxc/test/test/luxc/synthesizer/procedure.lux @@ -10,7 +10,6 @@ test) (luxc (lang ["la" analysis] ["ls" synthesis]) - (analyser [";A" structure]) [synthesizer]) (.. common)) diff --git a/new-luxc/test/tests.lux b/new-luxc/test/tests.lux index 13eb44402..c112e4076 100644 --- a/new-luxc/test/tests.lux +++ b/new-luxc/test/tests.lux @@ -5,15 +5,15 @@ (concurrency [promise]) [cli #+ program:] [test]) - (test (luxc ["_;P" parser] - (analyser ["_;A" primitive] - ["_;A" structure] - ["_;A" reference] - ["_;A" case] - ["_;A" function] - ["_;A" type] - (procedure ["_;A" common] - ["_;A" host])) + (test (luxc (lang ["_;P" parser] + (analysis ["_;A" primitive] + ["_;A" structure] + ["_;A" reference] + ["_;A" case] + ["_;A" function] + ["_;A" type] + (procedure ["_;A" common] + ["_;A" host]))) (synthesizer ["_;S" primitive] ["_;S" structure] (case ["_;S" special]) |