From e0f63b0cfda4d7dd0d233d13ce88b5da889dea02 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Tue, 31 Oct 2017 01:53:56 -0400 Subject: - Now, all special forms are handled as procedures. - "lux case" now takes its branches as a non-empty record. --- new-luxc/test/test/luxc/analyser/procedure/common.lux | 15 ++++++++------- new-luxc/test/test/luxc/analyser/procedure/host.jvm.lux | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'new-luxc/test') diff --git a/new-luxc/test/test/luxc/analyser/procedure/common.lux b/new-luxc/test/test/luxc/analyser/procedure/common.lux index 8649de3d7..5e1619d38 100644 --- a/new-luxc/test/test/luxc/analyser/procedure/common.lux +++ b/new-luxc/test/test/luxc/analyser/procedure/common.lux @@ -16,6 +16,7 @@ (luxc ["&" base] ["&;" scope] ["&;" module] + [";L" eval] (lang ["~" analysis]) [analyser] (analyser ["@" procedure] @@ -28,7 +29,7 @@ (-> Text (List Code) Type Bool) (|> (&;with-scope (&;with-expected-type output-type - (@;analyse-procedure analyse procedure params))) + (@;analyse-procedure analyse evalL;eval procedure params))) (meta;run (init-compiler [])) (case> (#e;Success _) @@ -262,7 +263,7 @@ (|> (&scope;with-scope "" (&scope;with-local [var-name arrayT] (&;with-expected-type elemT - (@;analyse-procedure analyse "lux array get" + (@;analyse-procedure analyse evalL;eval "lux array get" (list idxC (code;symbol ["" var-name])))))) (meta;run (init-compiler [])) @@ -275,7 +276,7 @@ (|> (&scope;with-scope "" (&scope;with-local [var-name arrayT] (&;with-expected-type arrayT - (@;analyse-procedure analyse "lux array put" + (@;analyse-procedure analyse evalL;eval "lux array put" (list idxC elemC (code;symbol ["" var-name])))))) @@ -289,7 +290,7 @@ (|> (&scope;with-scope "" (&scope;with-local [var-name arrayT] (&;with-expected-type arrayT - (@;analyse-procedure analyse "lux array remove" + (@;analyse-procedure analyse evalL;eval "lux array remove" (list idxC (code;symbol ["" var-name])))))) (meta;run (init-compiler [])) @@ -302,7 +303,7 @@ (|> (&scope;with-scope "" (&scope;with-local [var-name arrayT] (&;with-expected-type Nat - (@;analyse-procedure analyse "lux array size" + (@;analyse-procedure analyse evalL;eval "lux array size" (list (code;symbol ["" var-name])))))) (meta;run (init-compiler [])) (case> (#e;Success _) @@ -362,7 +363,7 @@ (|> (&scope;with-scope "" (&scope;with-local [var-name atomT] (&;with-expected-type elemT - (@;analyse-procedure analyse "lux atom read" + (@;analyse-procedure analyse evalL;eval "lux atom read" (list (code;symbol ["" var-name])))))) (meta;run (init-compiler [])) (case> (#e;Success _) @@ -374,7 +375,7 @@ (|> (&scope;with-scope "" (&scope;with-local [var-name atomT] (&;with-expected-type Bool - (@;analyse-procedure analyse "lux atom compare-and-swap" + (@;analyse-procedure analyse evalL;eval "lux atom compare-and-swap" (list elemC elemC (code;symbol ["" var-name])))))) diff --git a/new-luxc/test/test/luxc/analyser/procedure/host.jvm.lux b/new-luxc/test/test/luxc/analyser/procedure/host.jvm.lux index d1520e5b7..3cee1b160 100644 --- a/new-luxc/test/test/luxc/analyser/procedure/host.jvm.lux +++ b/new-luxc/test/test/luxc/analyser/procedure/host.jvm.lux @@ -20,6 +20,7 @@ (luxc ["&" base] ["&;" scope] ["&;" module] + [";L" eval] (lang ["~" analysis]) [analyser] (analyser ["@" procedure] @@ -36,7 +37,7 @@ [runtime-bytecode @runtime;generate] (&;with-scope (&;with-expected-type output-type - (@;analyse-procedure analyse procedure params)))) + (@;analyse-procedure analyse evalL;eval procedure params)))) (meta;run (init-compiler [])) (case> (#e;Success _) -- cgit v1.2.3