about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-09-12 23:06:37 -0700
committerKartik K. Agaram <vc@akkartik.com>2016-09-12 23:06:37 -0700
commit17ec401647b89ed5b34974bf327d9c91fc29b7a4 (patch)
tree2236c9abba76e7858d7e922cd11022f944e2b5dd
parentdb01afa844004406da3a6ab9b306219c807e057e (diff)
downloadmu-17ec401647b89ed5b34974bf327d9c91fc29b7a4.tar.gz
3344
-rw-r--r--018type_abbreviations.cc10
-rw-r--r--058to_text.cc3
-rw-r--r--061text.mu1
3 files changed, 8 insertions, 6 deletions
diff --git a/018type_abbreviations.cc b/018type_abbreviations.cc
index 03afe351..3087c828 100644
--- a/018type_abbreviations.cc
+++ b/018type_abbreviations.cc
@@ -123,11 +123,11 @@ void clear_type_abbreviations() {
 //:: A few default abbreviations.
 
 :(before "End Mu Types Initialization")
-put(Type_abbreviations, "&", new type_tree("address"));
-put(Type_abbreviations, "@", new type_tree("array"));
-put(Type_abbreviations, "num", new type_tree("number"));
-put(Type_abbreviations, "bool", new type_tree("boolean"));
-put(Type_abbreviations, "char", new type_tree("character"));
+put(Type_abbreviations, "&", new_type_tree("address"));
+put(Type_abbreviations, "@", new_type_tree("array"));
+put(Type_abbreviations, "num", new_type_tree("number"));
+put(Type_abbreviations, "bool", new_type_tree("boolean"));
+put(Type_abbreviations, "char", new_type_tree("character"));
 
 :(scenario use_type_abbreviations_when_declaring_type_abbreviations)
 type foo = &:num
diff --git a/058to_text.cc b/058to_text.cc
index 75a6b295..502199a2 100644
--- a/058to_text.cc
+++ b/058to_text.cc
@@ -2,6 +2,9 @@
 //: Later layers will allow us to override this to do something smarter for
 //: specific types.
 
+:(before "End Mu Types Initialization")
+put(Type_abbreviations, "text", new_type_tree("address:array:character"));
+
 :(before "End Primitive Recipe Declarations")
 TO_TEXT,
 :(before "End Primitive Recipe Numbers")
diff --git a/061text.mu b/061text.mu
index 5e3f798a..771d5b17 100644
--- a/061text.mu
+++ b/061text.mu
@@ -1,5 +1,4 @@
 # Some useful helpers for dealing with text (arrays of characters)
-type text = address:array:character
 
 def equal a:text, b:text -> result:boolean [
   local-scope