Rename AST types to type expressions

source.elna

@@ -72,13 +72,13 @@ type
     first: Position
 	last: Position
   end
-  FILE* = record end
   SourceFile* = record
 	buffer: [1024]Char
 	handle: ^FILE
 	size: Word
 	index: Word
   end
+  FILE* = record end
   StringBuffer* = record
     data: ^Byte
     size: Word
@@ -92,15 +92,14 @@ type
 	advance: proc(data: ^Byte)
 	head: proc(data: ^Byte) -> Char
   end
-  TokenValue* = union
-    int_value: Int
-    string: String
-	boolean_value: Bool
-	char_value: Char
-  end
   Token* = record
     kind: Int
-    value: TokenValue
+    value: union
+      int_value: Int
+      string: String
+	  boolean_value: Bool
+	  char_value: Char
+    end
 	location: Location
   end
   CommandLine* = record