Rewrote type section test case

parser/type_test.go

@@ -6,37 +6,50 @@ func TestType (test *testing.T) {
 	checkTree ("../tests/parser/type", false,
 `:arf
 ---
-type ro aBasic:Obj
+type ro aBasic:Obj:
-	ro that:Int
+	(
-	ro this:Int
+	.ro that:Int
-type ro bBitFields:Obj
+	.ro this:Int
-	ro that:Int & 1
+	)
-	ro this:Int & 24 298
+type ro bBitFields:Obj:
-type ro cInit:Obj
+	(
-	ro that:String "hello world"
+	.ro that:Int & 1
-	ro this:Int 23
+	.ro this:Int:<298> & 24
-type ro dInitInherit:aBasic
+	)
-	-- that 9384
+type ro cInit:Obj:
-	-- this 389
+	(
-type ro eInitAndDefine:aBasic
+	.ro that:String:<"hello world">
-	ro these:aBasic
+	.ro this:Int:<23>
-		ro born:Int 4
+	)
-		ro in:Int
+type ro dInitInherit:aBasic:
-		ro the:Int:3
+	(
-			9348
+	.that:<9384>
-			92384
+	.this:<389>
-			92834
+	)
-	-- this 389
+type ro cInitAndDefine:aBasic:
-	-- these
+	(
-		-- this 98
+	.ro these:aBasic:
-	-- that 9384
+		(
-
+		.ro born:Int:<4>
+		.ro in:Int
+		.ro the:Int:3:<9348 92384 92834>
+		):
+		(
+		.this:<98>
+		)
+	):
+	(
+	.that:<9384>
+	.this:<389>
+	)
 type ro fBasic:Int
-type ro gBasicInit:Int 6
+type ro gBasicInit:Int:<6>
 type ro hIntArray:{Int ..}
-type ro iIntArrayInit:Int:3
+type ro iIntArrayInit:Int:3:
+	<
 	3298
 	923
 	92
+	>
 `, test)
 }

tests/parser/type/main.arf

@@ -1,36 +1,35 @@
 :arf
 ---
-type ro aBasic:Obj
+type ro aBasic:Obj:(
-	ro that:Int
+	.ro that:Int
-	ro this:Int
+	.ro this:Int)
 
-type ro bBitFields:Obj
+type ro bBitFields:Obj:(
-	ro that:Int & 1
+	.ro that:Int & 1
-	ro this:Int & 24 298
+	.ro this:Int:<298> & 24)
 
-type ro cInit:Obj
+type ro cInit:Obj:(
-	ro that:String "hello world"
+	.ro that:String:<"hello world">
-	ro this:Int 23
+	.ro this:Int:<23>)
 
-type ro dInitInherit:aBasic
+type ro dInitInherit:aBasic:(
-	-- that 9384
+	.that:<9384>
-	-- this 389
+	.this:<389>)
 
-type ro cInitAndDefine:aBasic
+type ro cInitAndDefine:aBasic:(
-	-- this 389
+	.this:<389>
-	ro these:aBasic
+	.ro these:aBasic:(
-		ro born:Int 4
+		.ro born:Int:<4>
-		ro in:Int
+		.ro in:Int
-		ro the:Int:3
+		.ro the:Int:3:<9348 92384 92834>
-			9348 92384 92834
+		.this:<98>)
-		-- this 98
+	.that:<9384>)
-	-- that 9384
 
 type ro fBasic:Int
 
-type ro gBasicInit:Int 6
+type ro gBasicInit:Int:<6>
 
 type ro hIntArray:{Int ..}
 
-type ro iIntArrayInit:Int:3
+type ro iIntArrayInit:Int:3:
-	3298 923 92
+	<3298 923 92>