diff options
Diffstat (limited to 'new-luxc/source/luxc/analyser')
| -rw-r--r-- | new-luxc/source/luxc/analyser/case.lux | 6 | ||||
| -rw-r--r-- | new-luxc/source/luxc/analyser/function.lux | 6 | ||||
| -rw-r--r-- | new-luxc/source/luxc/analyser/reference.lux | 4 | ||||
| -rw-r--r-- | new-luxc/source/luxc/analyser/structure.lux | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/new-luxc/source/luxc/analyser/case.lux b/new-luxc/source/luxc/analyser/case.lux index 8ef4b030b..9a205d934 100644 --- a/new-luxc/source/luxc/analyser/case.lux +++ b/new-luxc/source/luxc/analyser/case.lux @@ -16,7 +16,7 @@ (type ["TC" check])) (../.. ["&" base] (lang ["la" analysis]) - ["&;" env]) + ["&;" scope]) (.. ["&;" common] ["&;" structure]) (. ["&&;" coverage])) @@ -81,9 +81,9 @@ [cursor (#;Symbol ["" name])] (&;with-cursor cursor (do Monad<Lux> - [outputA (&env;with-local [name inputT] + [outputA (&scope;with-local [name inputT] next) - idx &env;next-local] + idx &scope;next-local] (wrap [(#la;BindP idx) outputA]))) [cursor (#;Symbol ident)] diff --git a/new-luxc/source/luxc/analyser/function.lux b/new-luxc/source/luxc/analyser/function.lux index f1d7fdd31..31bc367f4 100644 --- a/new-luxc/source/luxc/analyser/function.lux +++ b/new-luxc/source/luxc/analyser/function.lux @@ -9,7 +9,7 @@ (type ["TC" check])) (luxc ["&" base] (lang ["la" analysis #+ Analysis]) - ["&;" env] + ["&;" scope] (analyser ["&;" common] ["&;" inference]))) @@ -79,8 +79,8 @@ &;with-scope ## Functions have access not only to their argument, but ## also to themselves, through a local variable. - (&env;with-local [func-name functionT]) - (&env;with-local [arg-name inputT]) + (&scope;with-local [func-name functionT]) + (&scope;with-local [arg-name inputT]) (&;with-expected-type outputT) (analyse body)) diff --git a/new-luxc/source/luxc/analyser/reference.lux b/new-luxc/source/luxc/analyser/reference.lux index 5f09ee774..d664ac9d0 100644 --- a/new-luxc/source/luxc/analyser/reference.lux +++ b/new-luxc/source/luxc/analyser/reference.lux @@ -5,7 +5,7 @@ (type ["TC" check])) (luxc ["&" base] (lang ["la" analysis #+ Analysis]) - ["&;" env])) + ["&;" scope])) ## [Analysers] (def: (analyse-definition def-name) @@ -20,7 +20,7 @@ (def: (analyse-variable var-name) (-> Text (Lux (Maybe Analysis))) (do Monad<Lux> - [?var (&env;find var-name)] + [?var (&scope;find var-name)] (case ?var (#;Some [actual ref]) (do @ diff --git a/new-luxc/source/luxc/analyser/structure.lux b/new-luxc/source/luxc/analyser/structure.lux index ad7ad2a7a..e13d1d88a 100644 --- a/new-luxc/source/luxc/analyser/structure.lux +++ b/new-luxc/source/luxc/analyser/structure.lux @@ -20,7 +20,7 @@ (luxc ["&" base] (lang ["la" analysis]) ["&;" module] - ["&;" env] + ["&;" scope] (analyser ["&;" common] ["&;" inference]))) @@ -39,7 +39,7 @@ (do @ [valueA (&;with-expected-type variant-type (analyse valueC)) - temp &env;next-local] + temp &scope;next-local] (wrap (la;sum tag type-size temp valueA))) #;None @@ -189,7 +189,7 @@ expectedT macro;expected-type _ (&;within-type-env (TC;check expectedT inferredT)) - temp &env;next-local] + temp &scope;next-local] (wrap (la;sum idx case-size temp (|> valueA+ list;head assume))))) ## There cannot be any ambiguity or improper syntax when analysing |