diff options
9 files changed, 24 insertions, 24 deletions
diff --git a/stdlib/source/library/lux.lux b/stdlib/source/library/lux.lux index 7c97c8a7f..c912c6bb1 100644 --- a/stdlib/source/library/lux.lux +++ b/stdlib/source/library/lux.lux @@ -400,7 +400,7 @@ {#Sum Label {#Sum Label Alias}}}}} - {"#Definition" "#Type" "#Label" "#Slot" "#Alias"} + {"#Definition" "#Type" "#Tag" "#Slot" "#Alias"} .public) ... (type: .public (Bindings k v) @@ -1506,7 +1506,7 @@ ({{#Some [#module_hash _ #module_aliases _ #definitions definitions #imports _ #module_state _]} ({{#Some constant} ({{#Definition _} {#Right [state full_name]} - {#Label _} {#Right [state full_name]} + {#Tag _} {#Right [state full_name]} {#Slot _} {#Right [state full_name]} {#Type _} {#Right [state full_name]} @@ -1985,7 +1985,7 @@ {#Type [exported? type labels]} {#None} - {#Label _} + {#Tag _} {#None} {#Slot _} @@ -3518,7 +3518,7 @@ (list name) (list)) - {#Label _} + {#Tag _} (list) {#Slot _} @@ -3621,7 +3621,7 @@ {#Type [exported? type labels]} {#Some ..Type} - {#Label _} + {#Tag _} {#None} {#Slot _} @@ -3654,7 +3654,7 @@ {#Type [exported? type labels]} {#Right [state [..Type type]]} - {#Label _} + {#Tag _} {#Left (text#composite "Unknown definition: " (name#encoded name))} {#Slot _} diff --git a/stdlib/source/library/lux/meta.lux b/stdlib/source/library/lux/meta.lux index d933d561b..4e4c1a8d9 100644 --- a/stdlib/source/library/lux/meta.lux +++ b/stdlib/source/library/lux/meta.lux @@ -194,7 +194,7 @@ {.#Type [exported? type labels]} {.#None} - {.#Label _} + {.#Tag _} {.#None} {.#Slot _} @@ -334,7 +334,7 @@ {.#Alias _} {.#None} - {.#Label _} + {.#Tag _} {.#None} {.#Slot _} @@ -380,7 +380,7 @@ "Aliases are not considered exports: " (name#encoded name))) - {.#Label _} + {.#Tag _} (failure ($_ text#composite "Tags are not considered exports: " (name#encoded name))) @@ -404,7 +404,7 @@ {.#Type [exported? type labels]} (in .Type) - {.#Label _} + {.#Tag _} (failure ($_ text#composite "Tags have no type: " (name#encoded name))) @@ -444,7 +444,7 @@ {.#Type [exported? type labels]} (in type) - {.#Label _} + {.#Tag _} (..failure ($_ text#composite "Tag is not a type: " (name#encoded name))) {.#Slot _} @@ -474,7 +474,7 @@ {.#Type [exported? type labels]} {.#Some [name [exported? .Type type]]} - {.#Label _} + {.#Tag _} {.#None} {.#Slot _} @@ -566,7 +566,7 @@ (..failure ($_ text#composite "Unknown " <description> ": " (name#encoded tag_name))))))] - [tag .#Label "tag"] + [tag .#Tag "tag"] [slot .#Slot "slot"] ) @@ -622,7 +622,7 @@ {.#Type _} def_name - {.#Label _} + {.#Tag _} def_name {.#Slot _} diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/module.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/module.lux index 0b05afdeb..877566e72 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/module.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/module.lux @@ -53,7 +53,7 @@ {.#Type _} (format "type " (%.name name)) - {.#Label _} + {.#Tag _} (format "tag " (%.name name)) {.#Slot _} @@ -219,5 +219,5 @@ (..define short (if record? {.#Slot [exported? type tags index]} - {.#Label [exported? type tags index]}))) + {.#Tag [exported? type tags index]}))) (list.enumeration tags)))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux index d80069d47..90143d032 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux @@ -73,7 +73,7 @@ (/.except foreign_module_has_not_been_imported [current ::module]))) (/.except definition_has_not_been_exported def_name)))) - {.#Label _} + {.#Tag _} (/.except labels_are_not_definitions [def_name]) {.#Slot _} diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux index cc629f53d..bbac7e452 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux @@ -218,7 +218,7 @@ {.#Type [exported? def_value labels]}) (in (:as Type def_value)) - (^or {.#Label _} + (^or {.#Tag _} {.#Slot _}) (////.failure (exception.error ..not_a_type [(name_of .Macro')])) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux index 6cafe53ff..14d9b7e31 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux @@ -332,7 +332,7 @@ {.#Type _}) (module.define alias {.#Alias original}) - (^or {.#Label _} + (^or {.#Tag _} {.#Slot _}) (phase.except ..cannot_alias_a_label [[current_module alias] original])))) diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux index f54bca93b..8c8df0a6f 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux @@ -327,7 +327,7 @@ [{<tag> payload} (in [def_name {<tag> payload}])]) ([.#Alias] - [.#Label] + [.#Tag] [.#Slot]) {.#Definition [exported? type _]} diff --git a/stdlib/source/library/lux/type/abstract.lux b/stdlib/source/library/lux/type/abstract.lux index 1748d9ed4..81d04ac73 100644 --- a/stdlib/source/library/lux/type/abstract.lux +++ b/stdlib/source/library/lux/type/abstract.lux @@ -65,7 +65,7 @@ (^or {.#Type _} {.#Alias _} - {.#Label _} + {.#Tag _} {.#Slot _}) (undefined)))) @@ -127,7 +127,7 @@ (^or {.#Type _} {.#Alias _} - {.#Label _} + {.#Tag _} {.#Slot _}) (undefined)))) @@ -161,7 +161,7 @@ (^or {.#Type _} {.#Alias _} - {.#Label _} + {.#Tag _} {.#Slot _}) (undefined)))) diff --git a/stdlib/source/test/lux/meta.lux b/stdlib/source/test/lux/meta.lux index ba5a0cc1a..66a22d81c 100644 --- a/stdlib/source/test/lux/meta.lux +++ b/stdlib/source/test/lux/meta.lux @@ -675,7 +675,7 @@ (|> {.#Item tags_0} list.enumeration (list#each (function (_ [index short]) - [short {.#Label [false type_0 {.#Item tags_0} index]}]))) + [short {.#Tag [false type_0 {.#Item tags_0} index]}]))) (|> {.#Item tags_1} list.enumeration (list#each (function (_ [index short]) |