aboutsummaryrefslogtreecommitdiff
path: root/new-luxc/source
diff options
context:
space:
mode:
authorEduardo Julian2017-07-02 16:06:34 -0400
committerEduardo Julian2017-07-02 16:06:34 -0400
commita7cb1e8d06e62c710c3cdfc4b225e8b4a8c26205 (patch)
tree3efe23ad55525a502f0a59ae9d372dd4bd175db5 /new-luxc/source
parentd28c16939e02dbd7e3a2d987bc88135285938f2f (diff)
- Renamed "#Relative" to "#Variable" and "#Absolute" to "#Definition".
Diffstat (limited to '')
-rw-r--r--new-luxc/source/luxc/analyser.lux2
-rw-r--r--new-luxc/source/luxc/analyser/reference.lux4
-rw-r--r--new-luxc/source/luxc/lang/analysis.lux6
-rw-r--r--new-luxc/source/luxc/synthesizer.lux6
4 files changed, 9 insertions, 9 deletions
diff --git a/new-luxc/source/luxc/analyser.lux b/new-luxc/source/luxc/analyser.lux
index 799e2365d..6f9eda064 100644
--- a/new-luxc/source/luxc/analyser.lux
+++ b/new-luxc/source/luxc/analyser.lux
@@ -110,7 +110,7 @@
[[funcT =func] (&&common;with-unknown-type
(analyse func))]
(case =func
- (#la;Absolute def-name)
+ (#la;Definition def-name)
(do @
[[def-type def-anns def-value] (macro;find-def def-name)]
(if (macro;macro? def-anns)
diff --git a/new-luxc/source/luxc/analyser/reference.lux b/new-luxc/source/luxc/analyser/reference.lux
index ea0505c3b..5f09ee774 100644
--- a/new-luxc/source/luxc/analyser/reference.lux
+++ b/new-luxc/source/luxc/analyser/reference.lux
@@ -15,7 +15,7 @@
expected macro;expected-type
_ (&;within-type-env
(TC;check expected actual))]
- (wrap (#la;Absolute def-name))))
+ (wrap (#la;Definition def-name))))
(def: (analyse-variable var-name)
(-> Text (Lux (Maybe Analysis)))
@@ -27,7 +27,7 @@
[expected macro;expected-type
_ (&;within-type-env
(TC;check expected actual))]
- (wrap (#;Some (#la;Relative ref))))
+ (wrap (#;Some (#la;Variable ref))))
#;None
(wrap #;None))))
diff --git a/new-luxc/source/luxc/lang/analysis.lux b/new-luxc/source/luxc/lang/analysis.lux
index 308296086..9b7c000f3 100644
--- a/new-luxc/source/luxc/lang/analysis.lux
+++ b/new-luxc/source/luxc/lang/analysis.lux
@@ -28,8 +28,8 @@
(#Function Scope Analysis)
(#Apply Analysis Analysis)
(#Procedure Text (List Analysis))
- (#Relative Ref)
- (#Absolute Ident))
+ (#Variable Ref)
+ (#Definition Ident))
## Variants get analysed as binary sum types for the sake of semantic
## simplicity.
@@ -56,7 +56,7 @@
(case value
(#Sum _)
(#Case value (list [(#BindP temp)
- (#Relative (#;Local temp))]))
+ (#Variable (#;Local temp))]))
_
value)
diff --git a/new-luxc/source/luxc/synthesizer.lux b/new-luxc/source/luxc/synthesizer.lux
index 484864652..bd6220337 100644
--- a/new-luxc/source/luxc/synthesizer.lux
+++ b/new-luxc/source/luxc/synthesizer.lux
@@ -40,7 +40,7 @@
[#la;Deg #ls;Deg]
[#la;Real #ls;Real]
[#la;Text #ls;Text]
- [#la;Absolute #ls;Definition])
+ [#la;Definition #ls;Definition])
(#la;Product _)
(#ls;Tuple (L/map (recur +0 resolver num-locals) (&&structure;unfold-tuple exprA)))
@@ -49,7 +49,7 @@
(let [[tag last? value] (&&structure;unfold-variant choice)]
(#ls;Variant tag last? (recur +0 resolver num-locals value)))
- (#la;Relative ref)
+ (#la;Variable ref)
(case ref
(#;Local register)
(if (&&function;nested? outer-arity)
@@ -68,7 +68,7 @@
(let [inputS (recur +0 resolver num-locals inputA)]
(case (list;reverse branchesA)
(^multi (^ (list [(#la;BindP input-register)
- (#la;Relative (#;Local output-register))]))
+ (#la;Variable (#;Local output-register))]))
(n.= input-register output-register))
inputS