diff options
Diffstat (limited to '')
| -rw-r--r-- | new-luxc/source/luxc/lang/extension/analysis.lux | 18 | ||||
| -rw-r--r-- | new-luxc/source/luxc/lang/extension/analysis/common.lux (renamed from new-luxc/source/luxc/lang/analysis/procedure/common.lux) | 46 | ||||
| -rw-r--r-- | new-luxc/source/luxc/lang/extension/analysis/host.jvm.lux (renamed from new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux) | 39 |
3 files changed, 56 insertions, 47 deletions
diff --git a/new-luxc/source/luxc/lang/extension/analysis.lux b/new-luxc/source/luxc/lang/extension/analysis.lux index d034f2919..30f43acef 100644 --- a/new-luxc/source/luxc/lang/extension/analysis.lux +++ b/new-luxc/source/luxc/lang/extension/analysis.lux @@ -1,9 +1,19 @@ (.module: lux (lux (data [text] - (coll [dict #+ Dict]))) - [//]) + (coll [list "list/" Functor<List>] + [dict #+ Dict]))) + [//] + [/common] + [/host]) + +(def: realize + (-> /common.Bundle (Dict Text //.Analysis)) + (|>> dict.entries + (list/map (function [[name proc]] [name (proc name)])) + (dict.from-list text.Hash<Text>))) (def: #export defaults - (Dict Text //.Expression) - (dict.new text.Hash<Text>)) + (Dict Text //.Analysis) + (realize (dict.merge /common.procedures + /host.procedures))) diff --git a/new-luxc/source/luxc/lang/analysis/procedure/common.lux b/new-luxc/source/luxc/lang/extension/analysis/common.lux index ecdcd0bfd..079001b26 100644 --- a/new-luxc/source/luxc/lang/analysis/procedure/common.lux +++ b/new-luxc/source/luxc/lang/extension/analysis/common.lux @@ -17,20 +17,18 @@ (analysis ["&." common] [".A" function] [".A" case] - [".A" type])))) + [".A" type]))) + [///]) (exception: #export Incorrect-Procedure-Arity) (exception: #export Invalid-Syntax) ## [Utils] -(type: #export Proc - (-> &.Analyser &.Eval (List Code) (Meta la.Analysis))) - (type: #export Bundle - (Dict Text (-> Text Proc))) + (Dict Text (-> Text ///.Analysis))) (def: #export (install name unnamed) - (-> Text (-> Text Proc) + (-> Text (-> Text ///.Analysis) (-> Bundle Bundle)) (dict.put name unnamed)) @@ -48,7 +46,7 @@ " Actual Arity: " (|> actual nat-to-int %i))) (def: (simple proc inputsT+ outputT) - (-> Text (List Type) Type Proc) + (-> Text (List Type) Type ///.Analysis) (let [num-expected (list.size inputsT+)] (function [analyse eval args] (let [num-actual (list.size args)] @@ -64,25 +62,25 @@ (&.throw Incorrect-Procedure-Arity (wrong-arity proc num-expected num-actual))))))) (def: #export (nullary valueT proc) - (-> Type Text Proc) + (-> Type Text ///.Analysis) (simple proc (list) valueT)) (def: #export (unary inputT outputT proc) - (-> Type Type Text Proc) + (-> Type Type Text ///.Analysis) (simple proc (list inputT) outputT)) (def: #export (binary subjectT paramT outputT proc) - (-> Type Type Type Text Proc) + (-> Type Type Type Text ///.Analysis) (simple proc (list subjectT paramT) outputT)) (def: #export (trinary subjectT param0T param1T outputT proc) - (-> Type Type Type Type Text Proc) + (-> Type Type Type Type Text ///.Analysis) (simple proc (list subjectT param0T param1T) outputT)) ## [Analysers] ## "lux is" represents reference/pointer equality. (def: (lux//is proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval args] (do macro.Monad<Meta> [[var-id varT] (&.with-type-env tc.var)] @@ -92,7 +90,7 @@ ## "lux try" provides a simple way to interact with the host platform's ## error-handling facilities. (def: (lux//try proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list opC)) @@ -107,7 +105,7 @@ (&.throw Incorrect-Procedure-Arity (wrong-arity proc +1 (list.size args)))))) (def: (lux//function proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list [_ (#.Symbol ["" func-name])] @@ -119,7 +117,7 @@ (&.throw Incorrect-Procedure-Arity (wrong-arity proc +3 (list.size args)))))) (def: (lux//case proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list input [_ (#.Record branches)])) @@ -129,7 +127,7 @@ (&.throw Incorrect-Procedure-Arity (wrong-arity proc +2 (list.size args)))))) (def: (lux//in-module proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval argsC+] (case argsC+ (^ (list [_ (#.Text module-name)] exprC)) @@ -146,7 +144,7 @@ (do-template [<name> <analyser>] [(def: (<name> proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list typeC valueC)) @@ -159,7 +157,7 @@ [lux//coerce typeA.analyse-coerce]) (def: (lux//check//type proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list valueC)) @@ -296,7 +294,7 @@ ))) (def: (array//get proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval args] (do macro.Monad<Meta> [[var-id varT] (&.with-type-env tc.var)] @@ -304,7 +302,7 @@ analyse eval args)))) (def: (array//put proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval args] (do macro.Monad<Meta> [[var-id varT] (&.with-type-env tc.var)] @@ -312,7 +310,7 @@ analyse eval args)))) (def: (array//remove proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval args] (do macro.Monad<Meta> [[var-id varT] (&.with-type-env tc.var)] @@ -355,7 +353,7 @@ ))) (def: (atom-new proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list initC)) @@ -370,7 +368,7 @@ (&.throw Incorrect-Procedure-Arity (wrong-arity proc +1 (list.size args)))))) (def: (atom-read proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval args] (do macro.Monad<Meta> [[var-id varT] (&.with-type-env tc.var)] @@ -378,7 +376,7 @@ analyse eval args)))) (def: (atom//compare-and-swap proc) - (-> Text Proc) + (-> Text ///.Analysis) (function [analyse eval args] (do macro.Monad<Meta> [[var-id varT] (&.with-type-env tc.var)] diff --git a/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/extension/analysis/host.jvm.lux index 3c29410d0..dba0e3e66 100644 --- a/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux +++ b/new-luxc/source/luxc/lang/extension/analysis/host.jvm.lux @@ -26,6 +26,7 @@ (analysis ["&." common] [".A" inference]))) ["@" //common] + [///] ) (exception: #export Wrong-Syntax) @@ -190,7 +191,7 @@ (dict.from-list text.Hash<Text>))) (def: (array-length proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list arrayC)) @@ -205,7 +206,7 @@ (&.throw @.Incorrect-Procedure-Arity (@.wrong-arity proc +1 (list.size args)))))) (def: (array-new proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list lengthC)) @@ -296,7 +297,7 @@ (&.throw Invalid-Type-For-Array-Element (%type elemT)))) (def: (array-read proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list arrayC idxC)) @@ -316,7 +317,7 @@ (&.throw @.Incorrect-Procedure-Arity (@.wrong-arity proc +2 (list.size args)))))) (def: (array-write proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list arrayC idxC valueC)) @@ -348,7 +349,7 @@ ))) (def: (object-null proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list)) @@ -361,7 +362,7 @@ (&.throw @.Incorrect-Procedure-Arity (@.wrong-arity proc +0 (list.size args)))))) (def: (object-null? proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list objectC)) @@ -376,7 +377,7 @@ (&.throw @.Incorrect-Procedure-Arity (@.wrong-arity proc +1 (list.size args)))))) (def: (object-synchronized proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list monitorC exprC)) @@ -471,7 +472,7 @@ (wrap (Class::isAssignableFrom [sub] super)))) (def: (object-throw proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list exceptionC)) @@ -491,7 +492,7 @@ (&.throw @.Incorrect-Procedure-Arity (@.wrong-arity proc +1 (list.size args)))))) (def: (object-class proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list classC)) @@ -509,7 +510,7 @@ (&.throw @.Incorrect-Procedure-Arity (@.wrong-arity proc +1 (list.size args)))))) (def: (object-instance? proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list classC objectC)) @@ -804,7 +805,7 @@ (wrap [castT unboxed sourceA]))) (def: (static-get proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list classC fieldC)) @@ -823,7 +824,7 @@ (&.throw @.Incorrect-Procedure-Arity (@.wrong-arity proc +2 (list.size args)))))) (def: (static-put proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list classC fieldC valueC)) @@ -847,7 +848,7 @@ (&.throw @.Incorrect-Procedure-Arity (@.wrong-arity proc +3 (list.size args)))))) (def: (virtual-get proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list classC fieldC objectC)) @@ -867,7 +868,7 @@ (&.throw @.Incorrect-Procedure-Arity (@.wrong-arity proc +3 (list.size args)))))) (def: (virtual-put proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case args (^ (list classC fieldC valueC objectC)) @@ -1111,7 +1112,7 @@ (wrap argA)))) (def: (invoke//static proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case (: (e.Error [Text Text (List [Text Code])]) (s.run args ($_ p.seq s.text s.text (p.some (s.tuple (p.seq s.text s.any)))))) @@ -1128,7 +1129,7 @@ (&.throw Wrong-Syntax (wrong-syntax proc args))))) (def: (invoke//virtual proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case (: (e.Error [Text Text Code (List [Text Code])]) (s.run args ($_ p.seq s.text s.text s.any (p.some (s.tuple (p.seq s.text s.any)))))) @@ -1151,7 +1152,7 @@ (&.throw Wrong-Syntax (wrong-syntax proc args))))) (def: (invoke//special proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case (: (e.Error [(List Code) [Text Text Code (List [Text Code]) Unit]]) (p.run args ($_ p.seq s.text s.text s.any (p.some (s.tuple (p.seq s.text s.any))) s.end!))) @@ -1168,7 +1169,7 @@ (&.throw Wrong-Syntax (wrong-syntax proc args))))) (def: (invoke//interface proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case (: (e.Error [Text Text Code (List [Text Code])]) (s.run args ($_ p.seq s.text s.text s.any (p.some (s.tuple (p.seq s.text s.any)))))) @@ -1189,7 +1190,7 @@ (&.throw Wrong-Syntax (wrong-syntax proc args))))) (def: (invoke//constructor proc) - (-> Text @.Proc) + (-> Text ///.Analysis) (function [analyse eval args] (case (: (e.Error [Text (List [Text Code])]) (s.run args ($_ p.seq s.text (p.some (s.tuple (p.seq s.text s.any)))))) |