aboutsummaryrefslogtreecommitdiff
path: root/new-luxc/source/luxc
diff options
context:
space:
mode:
Diffstat (limited to 'new-luxc/source/luxc')
-rw-r--r--new-luxc/source/luxc/eval.lux4
-rw-r--r--new-luxc/source/luxc/generator.lux8
-rw-r--r--new-luxc/source/luxc/generator/expression.jvm.lux (renamed from new-luxc/source/luxc/generator/expr.jvm.lux)0
-rw-r--r--new-luxc/source/luxc/generator/statement.jvm.lux4
4 files changed, 7 insertions, 9 deletions
diff --git a/new-luxc/source/luxc/eval.lux b/new-luxc/source/luxc/eval.lux
index 59c31abc7..91195fbfd 100644
--- a/new-luxc/source/luxc/eval.lux
+++ b/new-luxc/source/luxc/eval.lux
@@ -5,7 +5,7 @@
[../base]
(.. [analyser]
[synthesizer]
- (generator [expr]
+ (generator [";G" expression]
[eval])))
(def: #export (eval type exprC)
@@ -14,5 +14,5 @@
[exprA (../base;with-expected-type type
(analyser;analyser eval exprC))
#let [exprS (synthesizer;synthesize exprA)]
- exprI (expr;generate exprS)]
+ exprI (expressionG;generate exprS)]
(eval;eval exprI)))
diff --git a/new-luxc/source/luxc/generator.lux b/new-luxc/source/luxc/generator.lux
index ad5f578e3..90e0ca4cf 100644
--- a/new-luxc/source/luxc/generator.lux
+++ b/new-luxc/source/luxc/generator.lux
@@ -22,7 +22,7 @@
(generator ["&&;" runtime]
["&&;" statement]
["&&;" common]
- ["&&;" expr]
+ [";G" expression]
["&&;" eval])
))
@@ -41,7 +41,7 @@
[[_ metaA] (&;with-scope
(&;with-expected-type Code
(analyse metaC)))
- metaI (&&expr;generate (&synthesizer;synthesize metaA))
+ metaI (expressionG;generate (&synthesizer;synthesize metaA))
metaV (&&eval;eval metaI)
[_ valueT valueA] (&;with-scope
(if (meta;type? (:! Code metaV))
@@ -51,7 +51,7 @@
(wrap [Type valueA])))
(&analyser/common;with-unknown-type
(analyse valueC))))
- valueI (&&expr;generate (&synthesizer;synthesize valueA))
+ valueI (expressionG;generate (&synthesizer;synthesize valueA))
_ (&;with-scope
(&&statement;generate-def def-name valueT valueI metaI (:! Code metaV)))]
(wrap []))
@@ -63,7 +63,7 @@
[[_ programA] (&;with-scope
(&;with-expected-type (type (io;IO Unit))
(analyse programC)))
- programI (&&expr;generate (&synthesizer;synthesize programA))]
+ programI (expressionG;generate (&synthesizer;synthesize programA))]
(&&statement;generate-program program-args programI))
_
diff --git a/new-luxc/source/luxc/generator/expr.jvm.lux b/new-luxc/source/luxc/generator/expression.jvm.lux
index 61120ef86..61120ef86 100644
--- a/new-luxc/source/luxc/generator/expr.jvm.lux
+++ b/new-luxc/source/luxc/generator/expression.jvm.lux
diff --git a/new-luxc/source/luxc/generator/statement.jvm.lux b/new-luxc/source/luxc/generator/statement.jvm.lux
index 830935dda..6df522fb8 100644
--- a/new-luxc/source/luxc/generator/statement.jvm.lux
+++ b/new-luxc/source/luxc/generator/statement.jvm.lux
@@ -2,7 +2,6 @@
lux
(lux (control monad
["ex" exception #+ exception:])
- (concurrency ["T" task])
(data ["e" error]
[maybe]
[text "text/" Monoid<Text>]
@@ -14,8 +13,7 @@
["&;" scope]
["&;" module]
["&;" io]
- (generator ["&;" expr]
- ["&;" eval]
+ (generator ["&;" eval]
["&;" common]
(host ["$" jvm]
(jvm ["$t" type]