Better names for random text/character generators.

5 files changed, 161 insertions, 160 deletions

diff --git a/stdlib/source/library/lux/data/text/unicode/block.lux b/stdlib/source/library/lux/data/text/unicode/block.lux
index bb32ce2ba..2f0eae7f7 100644
--- a/stdlib/source/library/lux/data/text/unicode/block.lux
+++ b/stdlib/source/library/lux/data/text/unicode/block.lux
@@ -73,7 +73,7 @@
     (i64.or (i64.left_shifted 32 (..start value))
             (..end value))))
 
-(template [<name> <start> <end>]
+(template [<start> <end> <name>]
   [(def: .public <name>
      Block
      (let [start (hex <start>)
@@ -81,131 +81,132 @@
        (..block start (n.- start end))))]
 
   ... Normal blocks
-  [basic_latin                             "0000"  "007F"]
-  [latin_1_supplement                      "00A0"  "00FF"]
-  [latin_extended_a                        "0100"  "017F"]
-  [latin_extended_b                        "0180"  "024F"]
-  [ipa_extensions                          "0250"  "02AF"]
-  [spacing_modifier_letters                "02B0"  "02FF"]
-  [combining_diacritical_marks             "0300"  "036F"]
-  [greek_and_coptic                        "0370"  "03FF"]
-  [cyrillic                                "0400"  "04FF"]
-  [cyrillic_supplementary                  "0500"  "052F"]
-  [armenian                                "0530"  "058F"]
-  [hebrew                                  "0590"  "05FF"]
-  [arabic                                  "0600"  "06FF"]
-  [syriac                                  "0700"  "074F"]
-  [thaana                                  "0780"  "07BF"]
-  [devanagari                              "0900"  "097F"]
-  [bengali                                 "0980"  "09FF"]
-  [gurmukhi                                "0A00"  "0A7F"]
-  [gujarati                                "0A80"  "0AFF"]
-  [oriya                                   "0B00"  "0B7F"]
-  [tamil                                   "0B80"  "0BFF"]
-  [telugu                                  "0C00"  "0C7F"]
-  [kannada                                 "0C80"  "0CFF"]
-  [malayalam                               "0D00"  "0D7F"]
-  [sinhala                                 "0D80"  "0DFF"]
-  [thai                                    "0E00"  "0E7F"]
-  [lao                                     "0E80"  "0EFF"]
-  [tibetan                                 "0F00"  "0FFF"]
-  [myanmar                                 "1000"  "109F"]
-  [georgian                                "10A0"  "10FF"]
-  [hangul_jamo                             "1100"  "11FF"]
-  [ethiopic                                "1200"  "137F"]
-  [cherokee                                "13A0"  "13FF"]
-  [unified_canadian_aboriginal_syllabics   "1400"  "167F"]
-  [ogham                                   "1680"  "169F"]
-  [runic                                   "16A0"  "16FF"]
-  [tagalog                                 "1700"  "171F"]
-  [hanunoo                                 "1720"  "173F"]
-  [buhid                                   "1740"  "175F"]
-  [tagbanwa                                "1760"  "177F"]
-  [khmer                                   "1780"  "17FF"]
-  [mongolian                               "1800"  "18AF"]
-  [limbu                                   "1900"  "194F"]
-  [tai_le                                  "1950"  "197F"]
-  [khmer_symbols                           "19E0"  "19FF"]
-  [phonetic_extensions                     "1D00"  "1D7F"]
-  [latin_extended_additional               "1E00"  "1EFF"]
-  [greek_extended                          "1F00"  "1FFF"]
-  [general_punctuation                     "2000"  "206F"]
-  [superscripts_and_subscripts             "2070"  "209F"]
-  [currency_symbols                        "20A0"  "20CF"]
-  [combining_diacritical_marks_for_symbols "20D0"  "20FF"]
-  [letterlike_symbols                      "2100"  "214F"]
-  [number_forms                            "2150"  "218F"]
-  [arrows                                  "2190"  "21FF"]
-  [mathematical_operators                  "2200"  "22FF"]
-  [miscellaneous_technical                 "2300"  "23FF"]
-  [control_pictures                        "2400"  "243F"]
-  [optical_character_recognition           "2440"  "245F"]
-  [enclosed_alphanumerics                  "2460"  "24FF"]
-  [box_drawing                             "2500"  "257F"]
-  [block_elements                          "2580"  "259F"]
-  [geometric_shapes                        "25A0"  "25FF"]
-  [miscellaneous_symbols                   "2600"  "26FF"]
-  [dingbats                                "2700"  "27BF"]
-  [miscellaneous_mathematical_symbols_a    "27C0"  "27EF"]
-  [supplemental_arrows_a                   "27F0"  "27FF"]
-  [braille_patterns                        "2800"  "28FF"]
-  [supplemental_arrows_b                   "2900"  "297F"]
-  [miscellaneous_mathematical_symbols_b    "2980"  "29FF"]
-  [supplemental_mathematical_operators     "2A00"  "2AFF"]
-  [miscellaneous_symbols_and_arrows        "2B00"  "2BFF"]
-  [cjk_radicals_supplement                 "2E80"  "2EFF"]
-  [kangxi_radicals                         "2F00"  "2FDF"]
-  [ideographic_description_characters      "2FF0"  "2FFF"]
-  [cjk_symbols_and_punctuation             "3000"  "303F"]
-  [hiragana                                "3040"  "309F"]
-  [katakana                                "30A0"  "30FF"]
-  [bopomofo                                "3100"  "312F"]
-  [hangul_compatibility_jamo               "3130"  "318F"]
-  [kanbun                                  "3190"  "319F"]
-  [bopomofo_extended                       "31A0"  "31BF"]
-  [katakana_phonetic_extensions            "31F0"  "31FF"]
-  [enclosed_cjk_letters_and_months         "3200"  "32FF"]
-  [cjk_compatibility                       "3300"  "33FF"]
-  [cjk_unified_ideographs_extension_a      "3400"  "4DBF"]
-  [yijing_hexagram_symbols                 "4DC0"  "4DFF"]
-  [cjk_unified_ideographs                  "4E00"  "9FFF"]
-  [yi_syllables                            "A000"  "A48F"]
-  [yi_radicals                             "A490"  "A4CF"]
-  [hangul_syllables                        "AC00"  "D7AF"]
-  [high_surrogates                         "D800"  "DB7F"]
-  [high_private_use_surrogates             "DB80"  "DBFF"]
-  [low_surrogates                          "DC00"  "DFFF"]
-  [private_use_area                        "E000"  "F8FF"]
-  [cjk_compatibility_ideographs            "F900"  "FAFF"]
-  [alphabetic_presentation_forms           "FB00"  "FB4F"]
-  [arabic_presentation_forms_a             "FB50"  "FDFF"]
-  [variation_selectors                     "FE00"  "FE0F"]
-  [combining_half_marks                    "FE20"  "FE2F"]
-  [cjk_compatibility_forms                 "FE30"  "FE4F"]
-  [small_form_variants                     "FE50"  "FE6F"]
-  [arabic_presentation_forms_b             "FE70"  "FEFF"]
-  [halfwidth_and_fullwidth_forms           "FF00"  "FFEF"]
-  [specials                                "FFF0"  "FFFF"]
-  ... [linear_b_syllabary                      "10000" "1007F"]
-  ... [linear_b_ideograms                      "10080" "100FF"]
-  ... [aegean_numbers                          "10100" "1013F"]
-  ... [old_italic                              "10300" "1032F"]
-  ... [gothic                                  "10330" "1034F"]
-  ... [ugaritic                                "10380" "1039F"]
-  ... [deseret                                 "10400" "1044F"]
-  ... [shavian                                 "10450" "1047F"]
-  ... [osmanya                                 "10480" "104AF"]
-  ... [cypriot_syllabary                       "10800" "1083F"]
-  ... [byzantine_musical_symbols               "1D000" "1D0FF"]
-  ... [musical_symbols                         "1D100" "1D1FF"]
-  ... [tai_xuan_jing_symbols                   "1D300" "1D35F"]
-  ... [mathematical_alphanumeric_symbols       "1D400" "1D7FF"]
-  ... [cjk_unified_ideographs_extension_b      "20000" "2A6DF"]
-  ... [cjk_compatibility_ideographs_supplement "2F800" "2FA1F"]
-  ... [tags                                    "E0000" "E007F"]
+  ["0000" "007F" basic_latin]
+  ["00A0" "00FF" latin_1_supplement]
+  ["0100" "017F" latin_extended_a]
+  ["0180" "024F" latin_extended_b]
+  ["0250" "02AF" ipa_extensions]
+  ["02B0" "02FF" spacing_modifier_letters]
+  ["0300" "036F" combining_diacritical_marks]
+  ["0370" "03FF" greek_and_coptic]
+  ["0400" "04FF" cyrillic]
+  ["0500" "052F" cyrillic_supplementary]
+  ["0530" "058F" armenian]
+  ["0590" "05FF" hebrew]
+  ["0600" "06FF" arabic]
+  ["0700" "074F" syriac]
+  ["0780" "07BF" thaana]
+  ["0900" "097F" devanagari]
+  ["0980" "09FF" bengali]
+  ["0A00" "0A7F" gurmukhi]
+  ["0A80" "0AFF" gujarati]
+  ["0B00" "0B7F" oriya]
+  ["0B80" "0BFF" tamil]
+  ["0C00" "0C7F" telugu]
+  ["0C80" "0CFF" kannada]
+  ["0D00" "0D7F" malayalam]
+  ["0D80" "0DFF" sinhala]
+  ["0E00" "0E7F" thai]
+  ["0E80" "0EFF" lao]
+  ["0F00" "0FFF" tibetan]
+  ["1000" "109F" myanmar]
+  ["10A0" "10FF" georgian]
+  ["1100" "11FF" hangul_jamo]
+  ["1200" "137F" ethiopic]
+  ["13A0" "13FF" cherokee]
+  ["1400" "167F" unified_canadian_aboriginal_syllabics]
+  ["1680" "169F" ogham]
+  ["16A0" "16FF" runic]
+  ["1700" "171F" tagalog]
+  ["1720" "173F" hanunoo]
+  ["1740" "175F" buhid]
+  ["1760" "177F" tagbanwa]
+  ["1780" "17FF" khmer]
+  ["1800" "18AF" mongolian]
+  ["1900" "194F" limbu]
+  ["1950" "197F" tai_le]
+  ["19E0" "19FF" khmer_symbols]
+  ["1D00" "1D7F" phonetic_extensions]
+  ["1E00" "1EFF" latin_extended_additional]
+  ["1F00" "1FFF" greek_extended]
+  ["2000" "206F" general_punctuation]
+  ["2070" "209F" superscripts_and_subscripts]
+  ["20A0" "20CF" currency_symbols]
+  ["20D0" "20FF" combining_diacritical_marks_for_symbols]
+  ["2100" "214F" letterlike_symbols]
+  ["2150" "218F" number_forms]
+  ["2190" "21FF" arrows]
+  ["2200" "22FF" mathematical_operators]
+  ["2300" "23FF" miscellaneous_technical]
+  ["2400" "243F" control_pictures]
+  ["2440" "245F" optical_character_recognition]
+  ["2460" "24FF" enclosed_alphanumerics]
+  ["2500" "257F" box_drawing]
+  ["2580" "259F" block_elements]
+  ["25A0" "25FF" geometric_shapes]
+  ["2600" "26FF" miscellaneous_symbols]
+  ["2700" "27BF" dingbats]
+  ["27C0" "27EF" miscellaneous_mathematical_symbols_a]
+  ["27F0" "27FF" supplemental_arrows_a]
+  ["2800" "28FF" braille_patterns]
+  ["2900" "297F" supplemental_arrows_b]
+  ["2980" "29FF" miscellaneous_mathematical_symbols_b]
+  ["2A00" "2AFF" supplemental_mathematical_operators]
+  ["2B00" "2BFF" miscellaneous_symbols_and_arrows]
+  ["2E80" "2EFF" cjk_radicals_supplement]
+  ["2F00" "2FDF" kangxi_radicals]
+  ["2FF0" "2FFF" ideographic_description_characters]
+  ["3000" "303F" cjk_symbols_and_punctuation]
+  ["3040" "309F" hiragana]
+  ["30A0" "30FF" katakana]
+  ["3100" "312F" bopomofo]
+  ["3130" "318F" hangul_compatibility_jamo]
+  ["3190" "319F" kanbun]
+  ["31A0" "31BF" bopomofo_extended]
+  ["31F0" "31FF" katakana_phonetic_extensions]
+  ["3200" "32FF" enclosed_cjk_letters_and_months]
+  ["3300" "33FF" cjk_compatibility]
+  ["3400" "4DBF" cjk_unified_ideographs_extension_a]
+  ["4DC0" "4DFF" yijing_hexagram_symbols]
+  ["4E00" "9FFF" cjk_unified_ideographs]
+  ["A000" "A48F" yi_syllables]
+  ["A490" "A4CF" yi_radicals]
+  ["AC00" "D7AF" hangul_syllables]
+  ["D800" "DB7F" high_surrogates]
+  ["DB80" "DBFF" high_private_use_surrogates]
+  ["DC00" "DFFF" low_surrogates]
+  ["E000" "F8FF" private_use_area]
+  ["F900" "FAFF" cjk_compatibility_ideographs]
+  ["FB00" "FB4F" alphabetic_presentation_forms]
+  ["FB50" "FDFF" arabic_presentation_forms_a]
+  ["FE00" "FE0F" variation_selectors]
+  ["FE20" "FE2F" combining_half_marks]
+  ["FE30" "FE4F" cjk_compatibility_forms]
+  ["FE50" "FE6F" small_form_variants]
+  ["FE70" "FEFF" arabic_presentation_forms_b]
+  ["FF00" "FFEF" halfwidth_and_fullwidth_forms]
+  ["FFF0" "FFFF" specials]
+  
+  ... ["10000" "1007F" linear_b_syllabary]
+  ... ["10080" "100FF" linear_b_ideograms]
+  ... ["10100" "1013F" aegean_numbers]
+  ... ["10300" "1032F" old_italic]
+  ... ["10330" "1034F" gothic]
+  ... ["10380" "1039F" ugaritic]
+  ... ["10400" "1044F" deseret]
+  ... ["10450" "1047F" shavian]
+  ... ["10480" "104AF" osmanya]
+  ... ["10800" "1083F" cypriot_syllabary]
+  ... ["1D000" "1D0FF" byzantine_musical_symbols]
+  ... ["1D100" "1D1FF" musical_symbols]
+  ... ["1D300" "1D35F" tai_xuan_jing_symbols]
+  ... ["1D400" "1D7FF" mathematical_alphanumeric_symbols]
+  ... ["20000" "2A6DF" cjk_unified_ideographs_extension_b]
+  ... ["2F800" "2FA1F" cjk_compatibility_ideographs_supplement]
+  ... ["E0000" "E007F" tags]
 
   ... Specialized blocks
-  [basic_latin/decimal                     "0030"  "0039"]
-  [basic_latin/upper                       "0041"  "005A"]
-  [basic_latin/lower                       "0061"  "007A"]
+  ["0030" "0039" numeric]
+  ["0041" "005A" upper_case]
+  ["0061" "007A" lower_case]
   )
diff --git a/stdlib/source/library/lux/data/text/unicode/set.lux b/stdlib/source/library/lux/data/text/unicode/set.lux
index 29552979a..b323804a9 100644
--- a/stdlib/source/library/lux/data/text/unicode/set.lux
+++ b/stdlib/source/library/lux/data/text/unicode/set.lux
@@ -238,10 +238,10 @@
      Set
      (..set <blocks>))]
 
-  [ascii           [//block.basic_latin (list)]]
-  [ascii/alpha     [//block.basic_latin/upper (list //block.basic_latin/lower)]]
-  [ascii/alpha_num [//block.basic_latin/upper (list //block.basic_latin/lower //block.basic_latin/decimal)]]
-  [ascii/numeric   [//block.basic_latin/decimal (list)]]
-  [ascii/upper     [//block.basic_latin/upper (list)]]
-  [ascii/lower     [//block.basic_latin/lower (list)]]
+  [ascii         [//block.basic_latin (list)]]
+  [alphabetic    [//block.upper_case (list //block.lower_case)]]
+  [alpha_numeric [//block.upper_case (list //block.lower_case //block.numeric)]]
+  [numeric       [//block.numeric (list)]]
+  [upper_case    [//block.upper_case (list)]]
+  [lower_case    [//block.lower_case (list)]]
   )
diff --git a/stdlib/source/library/lux/math/random.lux b/stdlib/source/library/lux/math/random.lux
index 5dc32f986..09f72d4bf 100644
--- a/stdlib/source/library/lux/math/random.lux
+++ b/stdlib/source/library/lux/math/random.lux
@@ -172,13 +172,13 @@
      (-> Nat (Random Text))
      (..text (..char <set>)))]
 
-  [unicode         unicode.character]
-  [ascii           unicode.ascii]
-  [ascii/alpha     unicode.ascii/alpha]
-  [ascii/alpha_num unicode.ascii/alpha_num]
-  [ascii/numeric   unicode.ascii/numeric]
-  [ascii/upper     unicode.ascii/upper]
-  [ascii/lower     unicode.ascii/lower]
+  [unicode       unicode.character]
+  [ascii         unicode.ascii]
+  [alphabetic    unicode.alphabetic]
+  [alpha_numeric unicode.alpha_numeric]
+  [numeric       unicode.numeric]
+  [upper_case    unicode.upper_case]
+  [lower_case    unicode.lower_case]
   )
 
 (template [<name> <type> <ctor> <gen>]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
index 576f8f24c..2d7a0d116 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux {"-" i64}
+  [lux {"-" i64 left right}
    ["[0]" meta]
    [abstract
     ["[0]" monad {"+" do}]]
diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux
index 84b644f47..78269e9a6 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux
@@ -1,7 +1,7 @@
 ... https://en.wikipedia.org/wiki/Tree_shaking
 (.using
  [library
-  [lux "*"
+  [lux {"-" all}
    [abstract
     [hash {"+" Hash}]
     ["[0]" monad {"+" do}]]
@@ -47,18 +47,18 @@
 
       (^.template [<tag>]
         [{<tag> left right}
-         (all list#composite
-              (again left)
-              (again right))])
+         (.all list#composite
+               (again left)
+               (again right))])
       ([synthesis.#Alt]
        [synthesis.#Seq])
       
       {synthesis.#Bit_Fork when then else}
       (case else
         {.#Some else}
-        (all list#composite
-             (again then)
-             (again else))
+        (.all list#composite
+              (again then)
+              (again else))
         
         {.#None}
         (again then))
@@ -106,28 +106,28 @@
       {synthesis.#Branch value}
       (case value
         {synthesis.#Exec this that}
-        (all list#composite
-             (references this)
-             (references that))
+        (.all list#composite
+              (references this)
+              (references that))
         
         {synthesis.#Let input _ body}
-        (all list#composite
-             (references input)
-             (references body))
+        (.all list#composite
+              (references input)
+              (references body))
         
         {synthesis.#If test then else}
-        (all list#composite
-             (references test)
-             (references then)
-             (references else))
+        (.all list#composite
+              (references test)
+              (references then)
+              (references else))
         
         {synthesis.#Get _ record}
         (references record)
         
         {synthesis.#Case input path}
-        (all list#composite
-             (references input)
-             (path_references references path)))
+        (.all list#composite
+              (references input)
+              (path_references references path)))
       
       {synthesis.#Loop value}
       (case value