Get rid of free-floating atoms. Everything has a type now!

distribution/lib/Standard/Base/0.0.0-dev/src/Data/Any.enso

@@ -2,15 +2,12 @@ from Standard.Base import all
 
 from Standard.Base.Error.Common import dataflow_error_handler
 
-# The type that subsumes all types.
-type Any
-
-    ## Any is the universal top-type, with all other types being subsumed by it.
+## Any is the universal top-type, with all other types being subsumed by it.
 
-       If a value of type Any is expected in a given location, _any value_ can
-       be used in that position.
-    @Builtin_Type
-    type Any
+   If a value of type Any is expected in a given location, _any value_ can
+   be used in that position.
+@Builtin_Type
+type Any
 
     ## PRIVATE
 
@@ -78,19 +75,19 @@ type Any
     == self that = if Meta.is_same_object self that then True else
         self_meta = Meta.meta self
         that_meta = Meta.meta that
-        case Cons self_meta that_meta of
-            Cons (Meta.Atom _) (Meta.Atom _) ->
+        case Pair_Data self_meta that_meta of
+            Pair_Data (Meta.Atom_Data _) (Meta.Atom_Data _) ->
                 c_1 = self_meta.constructor
                 c_2 = that_meta.constructor
                 if Meta.is_same_object c_1 c_2 . not then False else
                     f_1 = self_meta.fields
                     f_2 = that_meta.fields
                     0.up_to f_1.length . all i-> (f_1.at i) == (f_2.at i)
-            Cons (Meta.Error _) (Meta.Error _) -> self_meta.payload == that_meta.payload
-            Cons (Meta.Polyglot o_1) (Meta.Polyglot o_2) ->
+            Pair_Data (Meta.Error_Data _) (Meta.Error_Data _) -> self_meta.payload == that_meta.payload
+            Pair_Data (Meta.Polyglot_Data o_1) (Meta.Polyglot_Data o_2) ->
                 langs_match = (self_meta.get_language == Meta.Java) && (that_meta.get_language == Meta.Java)
                 if langs_match.not then False else o_1.equals o_2
-            Cons (Meta.Unresolved_Symbol _) (Meta.Unresolved_Symbol _) ->
+            Pair_Data (Meta.Unresolved_Symbol_Data _) (Meta.Unresolved_Symbol_Data _) ->
                 (self_meta.name == that_meta.name) && (self_meta.scope == that_meta.scope)
             ## Constructor comparison is covered by the identity equality.
                Primitive objects should define their own equality.

distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso

@@ -1,12 +1,8 @@
 import Standard.Base.Data.Vector
 
-## Utilities for working with primitive arrays.
+## The type of primitive mutable arrays.
+@Builtin_Type
 type Array
-
-    ## The type of primitive mutable arrays.
-    @Builtin_Type
-    type Array
-
     ## Gets the element at index in the array this.
 
        Arguments:
@@ -68,7 +64,7 @@ type Array
              [1, 2, 3, 4].to_array.to_default_visualization_data
     to_default_visualization_data : Text
     to_default_visualization_data self =
-        Vector.Vector self . to_default_visualization_data
+        Vector.Vector_Data self . to_default_visualization_data
 
 ## Creates an array with length 0.
 

distribution/lib/Standard/Base/0.0.0-dev/src/Data/Boolean.enso

@@ -1,12 +1,11 @@
-## Booleans.
-type Boolean
-
-    ## A type with only two possible values.
+## A type with only two possible values.
 
-       The boolean type represents the two truth values of boolean logic. It is
-       primarily used for control-flow.
-    @Builtin_Type
-    type Boolean
+   The boolean type represents the two truth values of boolean logic. It is
+   primarily used for control-flow.
+@Builtin_Type
+type Boolean
+    True
+    False
 
     ## Compares two booleans for equality.
 
@@ -106,11 +105,3 @@ type Boolean
              if (27 % 3) == 0 then IO.println "Fizz"
     if_then : Any -> Any | Nothing
     if_then self ~on_true = @Builtin_Method "Boolean.if_then"
-
-## The constructor for the value True.
-@Builtin_Type
-type True
-
-## The constructor for the value False.
-@Builtin_Type
-type False

distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso

@@ -7,16 +7,16 @@ type Index_Sub_Range
 
        Selects no items if `count` is less than or equal to 0.
        Selects all items  if `count` is greater than the length of the input.
-    type First (count : Integer = 1)
+    First (count : Integer = 1)
 
     ## Select the last `count` characters.
 
        Selects no items if `count` is less than or equal to 0.
        Selects all items  if `count` is greater than the length of the input.
-    type Last (count : Integer = 1)
+    Last (count : Integer = 1)
 
     ## Select elements from the start while the predicate returns `True`.
-    type While (predicate : (Any -> Boolean))
+    While (predicate : (Any -> Boolean))
 
     ## Selects specific indexes (starting from 0) either as an `Integer` or a
        `Range`.
@@ -28,18 +28,18 @@ type Index_Sub_Range
        Only ranges with positive step and positive indices are supported.
        Individual integer indices can be negative which allows for indexing
        from the end of the collection.
-    type By_Index (indexes : (Integer | Range | Vector (Integer | Range)) = [0])
+    By_Index (indexes : (Integer | Range | Vector (Integer | Range)) = [0])
 
     ## Gets a random sample of entries, without repetitions.
 
        If `count` is greater than the length of the input, a random permutation
        of all elements from the input is selected.
-    type Sample (count:Integer) (seed:Integer=Random.get_default_seed)
+    Sample (count:Integer) (seed:Integer=Random.get_default_seed)
 
     ## Gets every Nth entry.
 
        Arguments:
        - step: The step between consecutive entries that are included.
        - first: The first entry to include. If it is outside of bounds of the
          input, an error is raised.
-    type Every (step:Integer) (first:Integer=0)
+    Every (step:Integer) (first:Integer=0)

distribution/lib/Standard/Base/0.0.0-dev/src/Data/Interval.enso

@@ -13,7 +13,7 @@ export Standard.Base.Data.Interval.Bound
 
          example_exclusive = Interval.exclusive 0.1 0.5
 exclusive : Number -> Number -> Interval
-exclusive start end = Interval (Bound.Exclusive start) (Bound.Exclusive end)
+exclusive start end = Interval_Data (Bound.Exclusive start) (Bound.Exclusive end)
 
 ## Creates an interval that excludes its lower bound.
 
@@ -24,7 +24,7 @@ exclusive start end = Interval (Bound.Exclusive start) (Bound.Exclusive end)
 
          example_start_exclusive = Interval.start_exclusive 1 5
 start_exclusive : Number -> Number -> Interval
-start_exclusive start end = Interval (Bound.Exclusive start) (Bound.Inclusive end)
+start_exclusive start end = Interval_Data (Bound.Exclusive start) (Bound.Inclusive end)
 
 ## Creates an interval that excludes its upper bound.
 
@@ -35,7 +35,7 @@ start_exclusive start end = Interval (Bound.Exclusive start) (Bound.Inclusive en
 
          example_end_exclusive = Interval.end_exclusive 1 5
 end_exclusive : Number -> Number -> Interval
-end_exclusive start end = Interval (Bound.Inclusive start) (Bound.Exclusive end)
+end_exclusive start end = Interval_Data (Bound.Inclusive start) (Bound.Exclusive end)
 
 ## Creates an interval that includes both of its bounds.
 
@@ -46,7 +46,7 @@ end_exclusive start end = Interval (Bound.Inclusive start) (Bound.Exclusive end)
 
          example_inclusive = Interval.inclusive 0 0
 inclusive : Number -> Number -> Interval
-inclusive start end = Interval (Bound.Inclusive start) (Bound.Inclusive end)
+inclusive start end = Interval_Data (Bound.Inclusive start) (Bound.Inclusive end)
 
 ## A type representing an interval over real numbers.
 type Interval
@@ -58,7 +58,7 @@ type Interval
        Arguments:
        - start: The start of the interval.
        - end: The end of the interval.
-    type Interval (start : Number) (end : Number)
+    Interval_Data (start : Bound.Bound) (end : Bound.Bound)
 
     ## Checks if the interval contains `that`.
 

distribution/lib/Standard/Base/0.0.0-dev/src/Data/Interval/Bound.enso

@@ -16,7 +16,7 @@ type Bound
              import Standard.Base.Data.Interval.Bound
 
              example_bound_inclusive = Bound.Inclusive 2
-    type Inclusive n
+    Inclusive n
 
     ## A bound that excludes the value `n`.
 
@@ -29,4 +29,4 @@ type Bound
              import Standard.Base.Data.Interval.Bound
 
              example_bound_exclusive = Bound.Exclusive 2.
-    type Exclusive n
+    Exclusive n

distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso

@@ -39,7 +39,7 @@ from_pairs contents =
 parse : Text -> Json ! Parse_Error
 parse json_text =
     Panic.catch_java Any (Internal.parse_helper json_text) java_exception->
-        Error.throw (Parse_Error java_exception.getMessage)
+        Error.throw (Parse_Error_Data java_exception.getMessage)
 
 ## Represents a JSON structure.
 type Json
@@ -48,34 +48,34 @@ type Json
 
        Arguments:
        - fields: The fields of the JSON object.
-    type Object fields
+    Object fields
 
     ## A representation of a JSON array.
 
        Arguments:
        - items: The items in the JSON array.
-    type Array items
+    Array items
 
     ## A representation of a JSON string.
 
        Arguments:
        - value: The text contained in the JSON string.
-    type String value
+    String value
 
     ## A representation of a JSON number.
 
        Arguments:
        - value: The number contained in the JSON number.
-    type Number value
+    Number value
 
     ## A representation of a JSON boolean.
 
        Arguments:
        - value: The boolean contained in a JSON boolean.
-    type Boolean value
+    Boolean value
 
     ## A representation of a JSON null.
-    type Null
+    Null
 
     ## Marshalls this JSON into an arbitrary value described by
        `type_descriptor`.
@@ -133,19 +133,39 @@ type Json
              example_unwrap = Json.Number 3 . unwrap
     unwrap : Any
     unwrap self = case self of
-        Json.Array its -> its.map .unwrap
-        Json.Boolean b -> b
-        Json.Number n -> n
-        Json.String t -> t
-        Json.Null -> Nothing
-        Json.Object f -> f.map .unwrap
+        Array its -> its.map .unwrap
+        Boolean b -> b
+        Number n -> n
+        String t -> t
+        Null -> Nothing
+        Object f -> f.map .unwrap
+
+    ## Gets the value associated with the given key in this object.
+
+       Arguments:
+       - field: The name of the field from which to get the value.
+
+       Throws `Nothing` if the associated key is not defined.
+
+       > Example
+         Get the "title" field from this JSON representing a book.
+
+             import Standard.Base.Data.Json
+             import Standard.Examples
+
+             example_get = Examples.json_object.get "title"
+    get : Text -> Json ! No_Such_Field_Error
+    get self field = self.fields.get field . map_error case _ of
+        Map.No_Value_For_Key_Error_Data _ -> No_Such_Field_Error_Data field
+        x -> x
 
 ## UNSTABLE
 
    A failure indicating malformed text input into the JSON parser.
 
    Check the `message` field for detailed information on the specific failure.
-type Parse_Error message
+type Parse_Error
+    Parse_Error_Data message
 
 ## UNSTABLE
 
@@ -154,29 +174,11 @@ Parse_Error.to_display_text : Text
 Parse_Error.to_display_text self =
     "Parse error in parsing JSON: " + self.message.to_text + "."
 
-## Gets the value associated with the given key in this object.
-
-   Arguments:
-   - field: The name of the field from which to get the value.
-
-   Throws `Nothing` if the associated key is not defined.
-
-   > Example
-     Get the "title" field from this JSON representing a book.
-
-         import Standard.Base.Data.Json
-         import Standard.Examples
-
-         example_get = Examples.json_object.get "title"
-Object.get : Text -> Json ! No_Such_Field_Error
-Object.get self field = self.fields.get field . map_error case _ of
-    Map.No_Value_For_Key_Error _ -> No_Such_Field_Error field
-    x -> x
-
 ## UNSTABLE
 
    An error indicating that there is no such field in the JSON object.
-type No_Such_Field_Error field_name
+type No_Such_Field_Error
+    No_Such_Field_Error_Data field_name
 
 ## UNSTABLE
 
@@ -201,7 +203,7 @@ type Marshalling_Error
        - format: The type format that did not match.
 
        This can occur e.g. when trying to reinterpret a number as a `Text`, etc.
-    type Type_Mismatch_Error json format
+    Type_Mismatch_Error json format
 
     ## UNSTABLE
 
@@ -215,7 +217,7 @@ type Marshalling_Error
 
        This can occure when trying to reinterpret a JSON object into an atom,
        when the JSON does not contain all the fields required by the atom.
-    type Missing_Field_Error json field format
+    Missing_Field_Error json field format
 
     ## UNSTABLE
 
@@ -243,21 +245,21 @@ type Marshalling_Error
 Any.to_json self =
     m = Meta.meta self
     case m of
-        Meta.Atom _ ->
-            cons = Meta.Constructor m.constructor
+        Meta.Atom_Data _ ->
+            cons = Meta.Constructor_Data m.constructor
             fs = m.fields
             fnames = cons.fields
             json_fs = 0.up_to fnames.length . fold Map.empty m-> i->
                 m.insert (fnames.at i) (fs.at i . to_json)
             with_tp = json_fs . insert "type" (String cons.name)
             Object with_tp
-        Meta.Constructor _ ->
+        Meta.Constructor_Data _ ->
             Object (Map.empty . insert "type" (String m.name))
 
         ## The following two cases cannot be handled generically and should
            instead define their own `to_json` implementations.
-        Meta.Polyglot _ -> Null
-        Meta.Primitive _ -> Null
+        Meta.Polyglot_Data _ -> Null
+        Meta.Primitive_Data _ -> Null
 
 ## Method used by object builders to convert a value into a valid JSON key.