aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib/source')
-rw-r--r--stdlib/source/lux/lang/analysis.lux72
-rw-r--r--stdlib/source/lux/lang/analysis/reference.lux20
-rw-r--r--stdlib/source/lux/lang/reference.lux66
-rw-r--r--stdlib/source/lux/lang/scope.lux14
-rw-r--r--stdlib/source/lux/lang/synthesis.lux10
-rw-r--r--stdlib/source/lux/lang/synthesis/case.lux3
-rw-r--r--stdlib/source/lux/lang/synthesis/expression.lux15
-rw-r--r--stdlib/source/lux/lang/synthesis/function.lux13
-rw-r--r--stdlib/source/lux/lang/synthesis/loop.lux35
9 files changed, 128 insertions, 120 deletions
diff --git a/stdlib/source/lux/lang/analysis.lux b/stdlib/source/lux/lang/analysis.lux
index 87cd99120..d5a25cad3 100644
--- a/stdlib/source/lux/lang/analysis.lux
+++ b/stdlib/source/lux/lang/analysis.lux
@@ -1,9 +1,8 @@
(.module:
[lux #- nat int deg]
- (lux (control [equality #+ Equality]
- [hash #+ Hash])
- [function]
- (data (coll [list "list/" Fold<List>]))))
+ (lux [function]
+ (data (coll [list "list/" Fold<List>])))
+ [//reference #+ Register Variable Reference])
(type: #export #rec Primitive
#Unit
@@ -20,8 +19,6 @@
(#Sum (Either a a))
(#Product [a a]))
-(type: #export Register Nat)
-
(type: #export #rec Pattern
(#Simple Primitive)
(#Complex (Composite Pattern))
@@ -31,35 +28,6 @@
{#when Pattern
#then e})
-(type: #export Variable
- (#Local Register)
- (#Foreign Register))
-
-(type: #export Reference
- (#Variable Variable)
- (#Constant Ident))
-
-(struct: #export _ (Equality Variable)
- (def: (= reference sample)
- (case [reference sample]
- (^template [<tag>]
- [(<tag> reference') (<tag> sample')]
- (n/= reference' sample'))
- ([#Local] [#Foreign])
-
- _
- false)))
-
-(struct: #export _ (Hash Variable)
- (def: eq Equality<Variable>)
- (def: (hash var)
- (case var
- (#Local register)
- (n/* +1 register)
-
- (#Foreign register)
- (n/* +2 register))))
-
(type: #export (Match' e)
[(Branch' e) (List (Branch' e))])
@@ -92,27 +60,6 @@
[control/case #Case]
)
-(do-template [<name> <family> <tag>]
- [(template: #export (<name> content)
- (<| #Reference
- <family>
- <tag>
- content))]
-
- [variable/local #..Variable #..Local]
- [variable/foreign #..Variable #..Foreign]
- )
-
-(do-template [<name> <tag>]
- [(template: #export (<name> content)
- (<| #Reference
- <tag>
- content))]
-
- [reference/variable #..Variable]
- [reference/constant #..Constant]
- )
-
(do-template [<name> <type> <tag>]
[(def: #export <name>
(-> <type> Analysis)
@@ -140,7 +87,9 @@
(n/= (dec size) tag))
(template: #export (no-op value)
- (#Apply value (#Function (list) (#Reference (#Variable (#Local +1))))))
+ (|> +1 #//reference.Local #//reference.Variable #..Reference
+ (#..Function (list))
+ (#..Apply value)))
(do-template [<name> <type> <structure> <prep-value>]
[(def: #export (<name> size tag value)
@@ -243,15 +192,6 @@
_
[analysis (list)]))
-(def: #export (self? var)
- (-> Variable Bool)
- (case var
- (#Local +0)
- true
-
- _
- false))
-
(template: #export (pattern/unit)
(#..Simple #..Unit))
diff --git a/stdlib/source/lux/lang/analysis/reference.lux b/stdlib/source/lux/lang/analysis/reference.lux
index e00edc178..cceb4db7d 100644
--- a/stdlib/source/lux/lang/analysis/reference.lux
+++ b/stdlib/source/lux/lang/analysis/reference.lux
@@ -3,11 +3,11 @@
(lux (control monad)
[macro]
(macro [code])
- [lang]
- (lang (type ["tc" check])
- [".L" scope]
- [".L" analysis #+ Analysis]
- (analysis [".A" type]))))
+ (lang (type ["tc" check])))
+ [// #+ Analysis]
+ [//type]
+ [///reference]
+ [///scope])
## [Analysers]
(def: (definition def-name)
@@ -20,19 +20,19 @@
_
(do @
- [_ (typeA.infer actualT)]
- (:: @ map (|>> analysisL.reference/constant)
+ [_ (//type.infer actualT)]
+ (:: @ map (|>> ///reference.constant #//.Reference)
(macro.normalize def-name))))))
(def: (variable var-name)
(-> Text (Meta (Maybe Analysis)))
(do macro.Monad<Meta>
- [?var (scopeL.find var-name)]
+ [?var (///scope.find var-name)]
(case ?var
(#.Some [actualT ref])
(do @
- [_ (typeA.infer actualT)]
- (wrap (#.Some (analysisL.reference/variable ref))))
+ [_ (//type.infer actualT)]
+ (wrap (#.Some (|> ref ///reference.variable #//.Reference))))
#.None
(wrap #.None))))
diff --git a/stdlib/source/lux/lang/reference.lux b/stdlib/source/lux/lang/reference.lux
new file mode 100644
index 000000000..98756aa08
--- /dev/null
+++ b/stdlib/source/lux/lang/reference.lux
@@ -0,0 +1,66 @@
+(.module:
+ lux
+ (lux (control [equality #+ Equality]
+ [hash #+ Hash]
+ pipe)))
+
+(type: #export Register Nat)
+
+(type: #export Variable
+ (#Local Register)
+ (#Foreign Register))
+
+(type: #export Reference
+ (#Variable Variable)
+ (#Constant Ident))
+
+(struct: #export _ (Equality Variable)
+ (def: (= reference sample)
+ (case [reference sample]
+ (^template [<tag>]
+ [(<tag> reference') (<tag> sample')]
+ (n/= reference' sample'))
+ ([#Local] [#Foreign])
+
+ _
+ false)))
+
+(struct: #export _ (Hash Variable)
+ (def: eq Equality<Variable>)
+ (def: (hash var)
+ (case var
+ (#Local register)
+ (n/* +1 register)
+
+ (#Foreign register)
+ (n/* +2 register))))
+
+(do-template [<name> <family> <tag>]
+ [(template: #export (<name> content)
+ (<| <family>
+ <tag>
+ content))]
+
+ [local #..Variable #..Local]
+ [foreign #..Variable #..Foreign]
+ )
+
+(do-template [<name> <tag>]
+ [(template: #export (<name> content)
+ (<| <tag>
+ content))]
+
+ [variable #..Variable]
+ [constant #..Constant]
+ )
+
+(def: #export self Reference (..local +0))
+
+(def: #export self?
+ (-> Variable Bool)
+ (|>> ..variable
+ (case> (^ (..local +0))
+ true
+
+ _
+ false)))
diff --git a/stdlib/source/lux/lang/scope.lux b/stdlib/source/lux/lang/scope.lux
index 1995338f4..217b7fcb3 100644
--- a/stdlib/source/lux/lang/scope.lux
+++ b/stdlib/source/lux/lang/scope.lux
@@ -9,9 +9,9 @@
(coll [list "list/" Functor<List> Fold<List> Monoid<List>]
(dictionary [plist])))
[macro])
- (// [analysis #+ Variable Register]))
+ [//reference #+ Register Variable])
-(type: Locals (Bindings Text [Type Nat]))
+(type: Locals (Bindings Text [Type Register]))
(type: Foreign (Bindings Text [Type Variable]))
(def: (is-local? name scope)
@@ -26,7 +26,7 @@
(get@ [#.locals #.mappings])
(plist.get name)
(maybe/map (function (_ [type value])
- [type (#analysis.Local value)]))))
+ [type (#//reference.Local value)]))))
(def: (is-captured? name scope)
(-> Text Scope Bool)
@@ -44,7 +44,7 @@
(#.Cons [_name [_source-type _source-ref]] mappings')
(if (text/= name _name)
- (#.Some [_source-type (#analysis.Foreign idx)])
+ (#.Some [_source-type (#//reference.Foreign idx)])
(recur (inc idx) mappings')))))
(def: (is-ref? name scope)
@@ -76,7 +76,7 @@
(get-ref name top-outer))
[ref inner'] (list/fold (: (-> Scope [Variable (List Scope)] [Variable (List Scope)])
(function (_ scope ref+inner)
- [(#analysis.Foreign (get@ [#.captured #.counter] scope))
+ [(#//reference.Foreign (get@ [#.captured #.counter] scope))
(#.Cons (update@ #.captured
(: (-> Foreign Foreign)
(|>> (update@ #.counter inc)
@@ -176,10 +176,10 @@
(-> Ref Variable)
(case ref
(#.Local register)
- (#analysis.Local register)
+ (#//reference.Local register)
(#.Captured register)
- (#analysis.Foreign register)))
+ (#//reference.Foreign register)))
(def: #export (environment scope)
(-> Scope (List Variable))
diff --git a/stdlib/source/lux/lang/synthesis.lux b/stdlib/source/lux/lang/synthesis.lux
index c26564001..d68b535dc 100644
--- a/stdlib/source/lux/lang/synthesis.lux
+++ b/stdlib/source/lux/lang/synthesis.lux
@@ -8,7 +8,8 @@
[number]
(coll (dictionary ["dict" unordered #+ Dict])))
[function])
- [//analysis #+ Register Variable Reference Environment Special Analysis])
+ [//reference #+ Register Variable Reference]
+ [//analysis #+ Environment Special Analysis])
(type: #export Arity Nat)
@@ -22,7 +23,7 @@
(def: #export fresh-resolver
Resolver
- (dict.new //analysis.Hash<Variable>))
+ (dict.new //reference.Hash<Variable>))
(def: #export init
State
@@ -229,12 +230,11 @@
(do-template [<name> <tag>]
[(template: #export (<name> content)
(<| #..Reference
- #//analysis.Variable
<tag>
content))]
- [variable/local #//analysis.Local]
- [variable/foreign #//analysis.Foreign]
+ [variable/local //reference.local]
+ [variable/foreign //reference.foreign]
)
(do-template [<name> <family> <tag>]
diff --git a/stdlib/source/lux/lang/synthesis/case.lux b/stdlib/source/lux/lang/synthesis/case.lux
index ca7524072..5fe32e62d 100644
--- a/stdlib/source/lux/lang/synthesis/case.lux
+++ b/stdlib/source/lux/lang/synthesis/case.lux
@@ -9,6 +9,7 @@
text/format
[number "frac/" Eq<Frac>]
(coll [list "list/" Fold<List> Monoid<List>])))
+ [///reference]
[///analysis #+ Pattern Match Analysis]
[// #+ Path Synthesis Operation]
[//function])
@@ -130,7 +131,7 @@
[[(#///analysis.Bind inputR) headB/bodyA]
#.Nil]
(case headB/bodyA
- (^ (///analysis.variable/local outputR))
+ (^ (#///analysis.Reference (///reference.local outputR)))
(wrap (if (n/= inputR outputR)
inputS
(//.branch/exec inputS)))
diff --git a/stdlib/source/lux/lang/synthesis/expression.lux b/stdlib/source/lux/lang/synthesis/expression.lux
index d556048b3..aab092777 100644
--- a/stdlib/source/lux/lang/synthesis/expression.lux
+++ b/stdlib/source/lux/lang/synthesis/expression.lux
@@ -5,6 +5,7 @@
(data [maybe]
(coll [list "list/" Functor<List>]
(dictionary ["dict" unordered #+ Dict]))))
+ [///reference]
[///analysis #+ Analysis]
[///extension #+ Extension]
[// #+ Synthesis]
@@ -71,14 +72,14 @@
(#///analysis.Reference reference)
(case reference
- (#///analysis.Constant constant)
+ (#///reference.Constant constant)
(operation/wrap (#//.Reference reference))
- (#///analysis.Variable var)
+ (#///reference.Variable var)
(do //.Operation@Monad
[resolver //.resolver]
(case var
- (#///analysis.Local register)
+ (#///reference.Local register)
(do @
[arity //.scope-arity]
(wrap (if (//function.nested? arity)
@@ -88,11 +89,11 @@
(list/map (|>> //.variable/local))
[(//.variable/local +0)]
//.function/apply)
- (#//.Reference (#///analysis.Variable (//function.adjust arity false var))))
- (#//.Reference (#///analysis.Variable var)))))
+ (#//.Reference (#///reference.Variable (//function.adjust arity false var))))
+ (#//.Reference (#///reference.Variable var)))))
- (#///analysis.Foreign register)
- (wrap (|> resolver (dict.get var) (maybe.default var) #///analysis.Variable #//.Reference)))))
+ (#///reference.Foreign register)
+ (wrap (|> resolver (dict.get var) (maybe.default var) #///reference.Variable #//.Reference)))))
(#///analysis.Case inputA branchesAB+)
(//case.synthesize (//.indirectly synthesize) inputA branchesAB+)
diff --git a/stdlib/source/lux/lang/synthesis/function.lux b/stdlib/source/lux/lang/synthesis/function.lux
index 4bd6846e2..8014c3b4a 100644
--- a/stdlib/source/lux/lang/synthesis/function.lux
+++ b/stdlib/source/lux/lang/synthesis/function.lux
@@ -7,8 +7,9 @@
(data [maybe "maybe/" Monad<Maybe>]
[error]
(coll [list "list/" Functor<List> Monoid<List> Fold<List>]
- (dictionary ["dict" unordered #+ Dict])))
- (lang [".L" analysis #+ Variable Environment Analysis]))
+ (dictionary ["dict" unordered #+ Dict]))))
+ [///reference #+ Variable]
+ [///analysis #+ Environment Analysis]
[// #+ Arity Synthesis Synthesizer]
[//loop])
@@ -21,9 +22,9 @@
(def: #export (adjust up-arity after? var)
(-> Arity Bool Variable Variable)
(case var
- (#analysisL.Local register)
+ (#///reference.Local register)
(if (and after? (n/>= up-arity register))
- (#analysisL.Local (n/+ (dec up-arity) register))
+ (#///reference.Local (n/+ (dec up-arity) register))
var)
_
@@ -34,7 +35,7 @@
(loop [apply apply
args (list)]
(case apply
- (#analysisL.Apply arg func)
+ (#///analysis.Apply arg func)
(recur func (#.Cons arg args))
_
@@ -104,7 +105,7 @@
_
(|> (list.size environment) dec (list.n/range +0)
- (list/map (|>> #analysisL.Foreign)))))
+ (list/map (|>> #///reference.Foreign)))))
resolver' (if (and (nested? function-arity)
direct?)
(list/fold (.function (_ [from to] resolver')
diff --git a/stdlib/source/lux/lang/synthesis/loop.lux b/stdlib/source/lux/lang/synthesis/loop.lux
index 4dcc25873..1b5d3401c 100644
--- a/stdlib/source/lux/lang/synthesis/loop.lux
+++ b/stdlib/source/lux/lang/synthesis/loop.lux
@@ -6,7 +6,8 @@
(coll [list "list/" Functor<List>]))
(macro [code]
[syntax]))
- [///analysis #+ Register Variable Environment]
+ [///reference #+ Register Variable]
+ [///analysis #+ Environment]
[// #+ Path Abstraction Synthesis])
(type: #export (Transform a)
@@ -18,11 +19,11 @@
(#.Some _) true
#.None false))
-(template: #export (self-reference)
- (#//.Reference (#///analysis.Variable (#///analysis.Local +0))))
+(template: #export (self)
+ (#//.Reference (///reference.local +0)))
(template: (recursive-apply args)
- (#//.Apply (self-reference) args))
+ (#//.Apply (self) args))
(def: proper Bool true)
(def: improper Bool false)
@@ -30,7 +31,7 @@
(def: (proper? exprS)
(-> Synthesis Bool)
(case exprS
- (^ (self-reference))
+ (^ (self))
improper
(#//.Structure structure)
@@ -82,7 +83,7 @@
(#//.Function functionS)
(case functionS
(#//.Abstraction environment arity bodyS)
- (list.every? ///analysis.self? environment)
+ (list.every? ///reference.self? environment)
(#//.Apply funcS argsS)
(and (proper? funcS)
@@ -162,7 +163,7 @@
(-> Environment (Transform Variable))
(function (_ variable)
(case variable
- (#///analysis.Foreign register)
+ (#///reference.Foreign register)
(list.nth register environment)
_
@@ -210,18 +211,16 @@
(#//.Reference reference)
(case reference
- (#///analysis.Constant constant)
+ (^ (///reference.constant constant))
(#.Some exprS)
-
- (#///analysis.Variable variable)
- (case variable
- (#///analysis.Local register)
- (#.Some (#//.Reference (#///analysis.Variable (#///analysis.Local (n/+ offset register)))))
-
- (#///analysis.Foreign register)
- (|> scope-environment
- (list.nth register)
- (maybe/map (|>> #///analysis.Variable #//.Reference)))))
+
+ (^ (///reference.local register))
+ (#.Some (#//.Reference (///reference.local (n/+ offset register))))
+
+ (^ (///reference.foreign register))
+ (|> scope-environment
+ (list.nth register)
+ (maybe/map (|>> #///reference.Variable #//.Reference))))
(^ (//.branch/case [inputS pathS]))
(do maybe.Monad<Maybe>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 15:16:06 +0000