diff options
Diffstat (limited to '')
| -rw-r--r-- | new-luxc/source/luxc/lang/directive/jvm.lux (renamed from new-luxc/source/luxc/lang/statement/jvm.lux) | 24 | ||||
| -rw-r--r-- | new-luxc/source/program.lux | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/new-luxc/source/luxc/lang/statement/jvm.lux b/new-luxc/source/luxc/lang/directive/jvm.lux index 20ba938d1..5c1ddee0d 100644 --- a/new-luxc/source/luxc/lang/statement/jvm.lux +++ b/new-luxc/source/luxc/lang/directive/jvm.lux @@ -25,7 +25,7 @@ ["." parser]]]] [tool [compiler - ["." statement (#+ Handler Bundle)] + ["." directive (#+ Handler Bundle)] ["." phase ["." generation] [analysis @@ -34,7 +34,7 @@ ["." bundle] [analysis ["." jvm]] - [statement + [directive ["/" lux]]]]]]] [luxc [lang @@ -167,7 +167,7 @@ fields methods]) (do phase.monad - [parameters (statement.lift-analysis + [parameters (directive.lift-analysis (typeA.with-env (jvm.parameter-types parameters))) #let [mapping (list@fold (function (_ [parameterJ parameterT] mapping) @@ -207,10 +207,10 @@ name type)))) _def.fuse)] - super-classT (statement.lift-analysis + super-classT (directive.lift-analysis (typeA.with-env (luxT.check (luxT.class mapping) (..signature super-class)))) - super-interfaceT+ (statement.lift-analysis + super-interfaceT+ (directive.lift-analysis (typeA.with-env (monad.map check.monad (|>> ..signature (luxT.check (luxT.class mapping))) @@ -219,12 +219,12 @@ super-classT super-interfaceT+)] state (extension.lift phase.get-state) - #let [analyse (get@ [#statement.analysis #statement.phase] state) - synthesize (get@ [#statement.synthesis #statement.phase] state) - generate (get@ [#statement.generation #statement.phase] state)] + #let [analyse (get@ [#directive.analysis #directive.phase] state) + synthesize (get@ [#directive.synthesis #directive.phase] state) + generate (get@ [#directive.generation #directive.phase] state)] methods (monad.map @ (function (_ methodC) (do @ - [methodA (statement.lift-analysis + [methodA (directive.lift-analysis (case methodC (#Constructor method) (jvm.analyse-constructor-method analyse selfT mapping method) @@ -237,10 +237,10 @@ (#Overriden-Method method) (jvm.analyse-overriden-method analyse selfT mapping method)))] - (statement.lift-synthesis + (directive.lift-synthesis (synthesize methodA)))) methods) - _ (statement.lift-generation + _ (directive.lift-generation (generation.save! true ["" name] [name (_def.class #$.V1_6 #$.Public @@ -253,7 +253,7 @@ super-class super-interfaces field-definitions)])) #let [_ (log! (format "Class " name))]] - (wrap statement.no-requirements)))])) + (wrap directive.no-requirements)))])) (def: #export bundle (Bundle Anchor Inst Definition) diff --git a/new-luxc/source/program.lux b/new-luxc/source/program.lux index 36c6e3209..43cc9e9cd 100644 --- a/new-luxc/source/program.lux +++ b/new-luxc/source/program.lux @@ -36,7 +36,7 @@ ["_" jvm ["$d" def] ["$i" inst]]] - [statement + [directive [".S" jvm]] [translation ["." jvm |