Run gofmt -w on everything. Add 'gogc' option to use Go garbage

collector for memory management.

.gitignore

@@ -9,3 +9,7 @@ examples/foundation/foundation
 examples/foundation/ns
 examples/simple/simple
 examples/simple/ClassOne
+examples/memory/memory
+examples/memory/ns
+examples/gc/gc
+examples/gc/ns

ast/aligned_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestAlignedAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f8a1d8ccfd0 <col:47, col:57> aligned`:
+		`0x7f8a1d8ccfd0 <col:47, col:57> aligned`: testNode{&AlignedAttr{
-		testNode{&AlignedAttr{
 			Addr:       0x7f8a1d8ccfd0,
 			Pos:        NewPositionFromString("col:47, col:57"),
 			IsAligned:  true,
@@ -17,7 +16,7 @@ func TestAlignedAttr(t *testing.T) {
 			NewPositionFromString("col:47, col:57"),
 			[]Node{},
 		},
-		`0x2c8ba10 <col:42>`: testNode{ &AlignedAttr{
+		`0x2c8ba10 <col:42>`: testNode{&AlignedAttr{
 			Addr:       0x2c8ba10,
 			Pos:        NewPositionFromString("col:42"),
 			IsAligned:  false,
@@ -31,4 +30,3 @@ func TestAlignedAttr(t *testing.T) {
 
 	runNodeTests(t, nodes)
 }
-

ast/alloc_size_attr.go

@@ -2,7 +2,6 @@ package ast
 
 import (
 	"strings"
-
 	//"git.wow.st/gmp/nswrap/util"
 )
 

ast/alloc_size_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestAllocSizeAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f8e390a5d38 <col:100, col:114> 1 2`:
+		`0x7f8e390a5d38 <col:100, col:114> 1 2`: testNode{&AllocSizeAttr{
-		testNode{&AllocSizeAttr{
 			Addr:       0x7f8e390a5d38,
 			Pos:        NewPositionFromString("col:100, col:114"),
 			A:          "1",
@@ -18,8 +17,7 @@ func TestAllocSizeAttr(t *testing.T) {
 			NewPositionFromString("col:100, col:114"),
 			[]Node{},
 		},
-		`0x7fbd1a167f48 </usr/include/stdlib.h:342:37> Inherited 1 0`:
+		`0x7fbd1a167f48 </usr/include/stdlib.h:342:37> Inherited 1 0`: testNode{&AllocSizeAttr{
-		testNode{&AllocSizeAttr{
 			Addr:       0x7fbd1a167f48,
 			Pos:        NewPositionFromString("/usr/include/stdlib.h:342:37"),
 			Inherited:  true,
@@ -31,8 +29,7 @@ func TestAllocSizeAttr(t *testing.T) {
 			NewPositionFromString("/usr/include/stdlib.h:342:37"),
 			[]Node{},
 		},
-		`0x7fbd1a167f48 </usr/include/stdlib.h:342:37> Inherited 1`:
+		`0x7fbd1a167f48 </usr/include/stdlib.h:342:37> Inherited 1`: testNode{&AllocSizeAttr{
-		testNode{&AllocSizeAttr{
 			Addr:       0x7fbd1a167f48,
 			Pos:        NewPositionFromString("/usr/include/stdlib.h:342:37"),
 			Inherited:  true,

ast/always_inline_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestAlwaysInlineAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fce780f5018 </usr/include/sys/cdefs.h:313:68> always_inline`:
+		`0x7fce780f5018 </usr/include/sys/cdefs.h:313:68> always_inline`: testNode{&AlwaysInlineAttr{
-		testNode{&AlwaysInlineAttr{
 			Addr:       0x7fce780f5018,
 			Pos:        NewPositionFromString("/usr/include/sys/cdefs.h:313:68"),
 			ChildNodes: []Node{},

ast/arc_weakref_unavailable_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestArcWeakrefUnavailableAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&ArcWeakrefUnavailableAttr{
-		testNode{&ArcWeakrefUnavailableAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/array_filler_test.go

@@ -7,7 +7,7 @@ import (
 func TestArrayFiller(t *testing.T) {
 	i := 0
 	runNodeTest(t, Parse(`array filler`),
-		testNode{ &ArrayFiller{ ChildNodes: []Node{} },
+		testNode{&ArrayFiller{ChildNodes: []Node{}},
-		0,NewPositionFromString(""),[]Node{}},
+			0, NewPositionFromString(""), []Node{}},
 		&i)
 }

ast/array_subscript_expr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestArraySubscriptExpr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fe35b85d180 <col:63, col:69> 'char *' lvalue`:
+		`0x7fe35b85d180 <col:63, col:69> 'char *' lvalue`: testNode{&ArraySubscriptExpr{
-		testNode{&ArraySubscriptExpr{
 			Addr:       0x7fe35b85d180,
 			Pos:        NewPositionFromString("col:63, col:69"),
 			Type:       "char *",
@@ -19,8 +18,7 @@ func TestArraySubscriptExpr(t *testing.T) {
 			NewPositionFromString("col:63, col:69"),
 			[]Node{},
 		},
-		`0x2416660 <col:2, col:5> 'u32':'unsigned int' lvalue`:
+		`0x2416660 <col:2, col:5> 'u32':'unsigned int' lvalue`: testNode{&ArraySubscriptExpr{
-		testNode{&ArraySubscriptExpr{
 			Addr:       0x2416660,
 			Pos:        NewPositionFromString("col:2, col:5"),
 			Type:       "u32",
@@ -32,8 +30,7 @@ func TestArraySubscriptExpr(t *testing.T) {
 			NewPositionFromString("col:2, col:5"),
 			[]Node{},
 		},
-		`0x3f147c0 <col:39, col:55> 'extCoord':'extCoord' lvalue`:
+		`0x3f147c0 <col:39, col:55> 'extCoord':'extCoord' lvalue`: testNode{&ArraySubscriptExpr{
-		testNode{&ArraySubscriptExpr{
 			Addr:       0x3f147c0,
 			Pos:        NewPositionFromString("col:39, col:55"),
 			Type:       "extCoord",

ast/asm_label_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestAsmLabelAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7ff26d8224e8 </usr/include/sys/cdefs.h:569:36> "_fopen"`:
+		`0x7ff26d8224e8 </usr/include/sys/cdefs.h:569:36> "_fopen"`: testNode{&AsmLabelAttr{
-		testNode{&AsmLabelAttr{
 			Addr:         0x7ff26d8224e8,
 			Pos:          NewPositionFromString("/usr/include/sys/cdefs.h:569:36"),
 			Inherited:    false,
@@ -18,8 +17,7 @@ func TestAsmLabelAttr(t *testing.T) {
 			NewPositionFromString("/usr/include/sys/cdefs.h:569:36"),
 			[]Node{},
 		},
-		`0x7fd55a169318 </usr/include/stdio.h:325:47> Inherited "_popen"`:
+		`0x7fd55a169318 </usr/include/stdio.h:325:47> Inherited "_popen"`: testNode{&AsmLabelAttr{
-		testNode{&AsmLabelAttr{
 			Addr:         0x7fd55a169318,
 			Pos:          NewPositionFromString("/usr/include/stdio.h:325:47"),
 			Inherited:    true,

ast/ast.go

@@ -252,9 +252,9 @@ func Parse(fullline string) Node {
 	case "ObjCIndependentClassAttr":
 		return parseObjCIndependentClassAttr(line)
 	case "ObjCInterface":
-		return parseObjCInterface(line,false)
+		return parseObjCInterface(line, false)
 	case "super ObjCInterface":
-		return parseObjCInterface(line,true)
+		return parseObjCInterface(line, true)
 	case "ObjCInterfaceDecl":
 		return parseObjCInterfaceDecl(line)
 	case "ObjCInterfaceType":
@@ -394,7 +394,7 @@ func Parse(fullline string) Node {
 	case "NullStmt":
 		return nil
 	default:
-		return parseUnknown(nodeName,line)
+		return parseUnknown(nodeName, line)
 	}
 }
 

ast/ast_test.go

@@ -30,24 +30,24 @@ func formatMultiLine(o interface{}) string {
 
 func runNodeTest(t *testing.T, actual Node, expected testNode, i *int) {
 	testName := fmt.Sprintf("Example%d", *i)
-	t.Run(testName + "a", func(t *testing.T) {
+	t.Run(testName+"a", func(t *testing.T) {
 		if !reflect.DeepEqual(expected.n, actual) {
 			t.Errorf("%s", util.ShowDiff(formatMultiLine(expected.n),
 				formatMultiLine(actual)))
 		}
 	})
 	t.Run(testName+"b", func(t *testing.T) {
-		if !reflect.DeepEqual(actual.Address(),expected.addr) {
+		if !reflect.DeepEqual(actual.Address(), expected.addr) {
 			t.Errorf("Address mismatch")
 		}
 	})
 	t.Run(testName+"c", func(t *testing.T) {
-		if !reflect.DeepEqual(actual.Position(),expected.pos) {
+		if !reflect.DeepEqual(actual.Position(), expected.pos) {
 			t.Errorf("Position mismatch")
 		}
 	})
 	t.Run(testName+"d", func(t *testing.T) {
-		if !reflect.DeepEqual(actual.Children(),expected.children) {
+		if !reflect.DeepEqual(actual.Children(), expected.children) {
 			t.Errorf("Children mismatch")
 		}
 	})
@@ -55,8 +55,8 @@ func runNodeTest(t *testing.T, actual Node, expected testNode, i *int) {
 		cs := expected.children
 		node := &Unknown{}
 		actual.AddChild(node)
-		cs = append(cs,node)
+		cs = append(cs, node)
-		if !reflect.DeepEqual(actual.Children(),cs) {
+		if !reflect.DeepEqual(actual.Children(), cs) {
 			t.Errorf("Children mismatch")
 		}
 	})
@@ -71,7 +71,7 @@ func runNodeTests(t *testing.T, tests map[string]testNode) {
 		name := reflect.TypeOf(expected.n).Elem().Name()
 		actual := Parse(name + " " + line)
 
-		runNodeTest(t,actual,expected,&i)
+		runNodeTest(t, actual, expected, &i)
 	}
 }
 
@@ -96,7 +96,7 @@ func TestPrint(t *testing.T) {
 }
 
 var lines = []string{
-// c2go ast sqlite3.c | head -5000 | sed 's/^[ |`-]*//' | sed 's/<<<NULL>>>/NullStmt/g' | gawk 'length > 0 {print "`" $0 "`,"}'
+	// c2go ast sqlite3.c | head -5000 | sed 's/^[ |`-]*//' | sed 's/<<<NULL>>>/NullStmt/g' | gawk 'length > 0 {print "`" $0 "`,"}'
 }
 
 func BenchmarkParse(b *testing.B) {
@@ -106,4 +106,3 @@ func BenchmarkParse(b *testing.B) {
 		}
 	}
 }
-

ast/attributed_type.go

@@ -21,7 +21,7 @@ func parseAttributedType(line string) Node {
 	return &AttributedType{
 		Addr:       ParseAddress(groups["address"]),
 		Type:       groups["type"],
-		Sugar:      len(groups["sugar"])>0,
+		Sugar:      len(groups["sugar"]) > 0,
 		ChildNodes: []Node{},
 	}
 }

ast/attributed_type_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestAttributedType(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x10c0d6770 'CVDisplayLinkRef _Nonnull' sugar`:
+		`0x10c0d6770 'CVDisplayLinkRef _Nonnull' sugar`: testNode{&AttributedType{
-		 testNode{&AttributedType{
 			Addr:       0x10c0d6770,
 			Type:       `CVDisplayLinkRef _Nonnull`,
 			Sugar:      true,
@@ -17,8 +16,7 @@ func TestAttributedType(t *testing.T) {
 			NewPositionFromString(""),
 			[]Node{},
 		},
-		`0x10c0d68b0 'const CVTimeStamp * _Nonnull' sugar`:
+		`0x10c0d68b0 'const CVTimeStamp * _Nonnull' sugar`: testNode{&AttributedType{
-		testNode{&AttributedType{
 			Addr:       0x10c0d68b0,
 			Type:       `const CVTimeStamp * _Nonnull`,
 			Sugar:      true,
@@ -28,8 +26,7 @@ func TestAttributedType(t *testing.T) {
 			NewPositionFromString(""),
 			[]Node{},
 		},
-		`0x10c0d6ab0 'CVOptionFlags * _Nonnull' sugar`:
+		`0x10c0d6ab0 'CVOptionFlags * _Nonnull' sugar`: testNode{&AttributedType{
-		testNode{&AttributedType{
 			Addr:       0x10c0d6ab0,
 			Type:       `CVOptionFlags * _Nonnull`,
 			Sugar:      true,
@@ -39,8 +36,7 @@ func TestAttributedType(t *testing.T) {
 			NewPositionFromString(""),
 			[]Node{},
 		},
-		`0x10c0fc7d0 'CVPixelBufferRef _Nonnull' sugar`:
+		`0x10c0fc7d0 'CVPixelBufferRef _Nonnull' sugar`: testNode{&AttributedType{
-		testNode{&AttributedType{
 			Addr:       0x10c0fc7d0,
 			Type:       `CVPixelBufferRef _Nonnull`,
 			Sugar:      true,
@@ -50,8 +46,7 @@ func TestAttributedType(t *testing.T) {
 			NewPositionFromString(""),
 			[]Node{},
 		},
-		`0x7faa1906d680 'NSError * _Nullable' sugar`:
+		`0x7faa1906d680 'NSError * _Nullable' sugar`: testNode{&AttributedType{
-		testNode{&AttributedType{
 			Addr:       0x7faa1906d680,
 			Type:       `NSError * _Nullable`,
 			Sugar:      true,
@@ -61,8 +56,7 @@ func TestAttributedType(t *testing.T) {
 			NewPositionFromString(""),
 			[]Node{},
 		},
-		`0x7faa19085760 'id<NSSecureCoding> _Nullable' sugar`:
+		`0x7faa19085760 'id<NSSecureCoding> _Nullable' sugar`: testNode{&AttributedType{
-		testNode{&AttributedType{
 			Addr:       0x7faa19085760,
 			Type:       `id<NSSecureCoding> _Nullable`,
 			Sugar:      true,
@@ -72,8 +66,7 @@ func TestAttributedType(t *testing.T) {
 			NewPositionFromString(""),
 			[]Node{},
 		},
-		`0x7faa19085840 'NSError * _Null_unspecified' sugar`:
+		`0x7faa19085840 'NSError * _Null_unspecified' sugar`: testNode{&AttributedType{
-		testNode{&AttributedType{
 			Addr:       0x7faa19085840,
 			Type:       `NSError * _Null_unspecified`,
 			Sugar:      true,

ast/availability_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestAvailabilityAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc5ff8e5d18 </usr/include/AvailabilityInternal.h:21697:88, col:124> macos 10.10 0 0 "" ""`:
+		`0x7fc5ff8e5d18 </usr/include/AvailabilityInternal.h:21697:88, col:124> macos 10.10 0 0 "" ""`: testNode{&AvailabilityAttr{
-		testNode{&AvailabilityAttr{
 			Addr:          0x7fc5ff8e5d18,
 			Pos:           NewPositionFromString("/usr/include/AvailabilityInternal.h:21697:88, col:124"),
 			OS:            "macos",
@@ -24,8 +23,7 @@ func TestAvailabilityAttr(t *testing.T) {
 			NewPositionFromString("/usr/include/AvailabilityInternal.h:21697:88, col:124"),
 			[]Node{},
 		},
-		`0x7fc5ff8e60d0 </usr/include/Availability.h:215:81, col:115> watchos 3.0 0 0 "" ""`:
+		`0x7fc5ff8e60d0 </usr/include/Availability.h:215:81, col:115> watchos 3.0 0 0 "" ""`: testNode{&AvailabilityAttr{
-		testNode{&AvailabilityAttr{
 			Addr:          0x7fc5ff8e60d0,
 			Pos:           NewPositionFromString("/usr/include/Availability.h:215:81, col:115"),
 			OS:            "watchos",
@@ -42,8 +40,7 @@ func TestAvailabilityAttr(t *testing.T) {
 			NewPositionFromString("/usr/include/Availability.h:215:81, col:115"),
 			[]Node{},
 		},
-		`0x7fc5ff8e6170 <col:81, col:115> tvos 10.0 0 0 "" ""`:
+		`0x7fc5ff8e6170 <col:81, col:115> tvos 10.0 0 0 "" ""`: testNode{&AvailabilityAttr{
-		testNode{&AvailabilityAttr{
 			Addr:          0x7fc5ff8e6170,
 			Pos:           NewPositionFromString("col:81, col:115"),
 			OS:            "tvos",
@@ -60,8 +57,7 @@ func TestAvailabilityAttr(t *testing.T) {
 			NewPositionFromString("col:81, col:115"),
 			[]Node{},
 		},
-		`0x7fc5ff8e61d8 <col:81, col:115> ios 10.0 0 0 "" ""`:
+		`0x7fc5ff8e61d8 <col:81, col:115> ios 10.0 0 0 "" ""`: testNode{&AvailabilityAttr{
-		testNode{&AvailabilityAttr{
 			Addr:          0x7fc5ff8e61d8,
 			Pos:           NewPositionFromString("col:81, col:115"),
 			OS:            "ios",
@@ -78,8 +74,7 @@ func TestAvailabilityAttr(t *testing.T) {
 			NewPositionFromString("col:81, col:115"),
 			[]Node{},
 		},
-		`0x7fc5ff8f0e18 </usr/include/sys/cdefs.h:275:50, col:99> swift 0 0 0 Unavailable "Use snprintf instead." ""`:
+		`0x7fc5ff8f0e18 </usr/include/sys/cdefs.h:275:50, col:99> swift 0 0 0 Unavailable "Use snprintf instead." ""`: testNode{&AvailabilityAttr{
-		testNode{&AvailabilityAttr{
 			Addr:          0x7fc5ff8f0e18,
 			Pos:           NewPositionFromString("/usr/include/sys/cdefs.h:275:50, col:99"),
 			OS:            "swift",
@@ -96,8 +91,7 @@ func TestAvailabilityAttr(t *testing.T) {
 			NewPositionFromString("/usr/include/sys/cdefs.h:275:50, col:99"),
 			[]Node{},
 		},
-		`0x7fc5ff8f1988 <line:275:50, col:99> swift 0 0 0 Unavailable "Use mkstemp(3) instead." ""`:
+		`0x7fc5ff8f1988 <line:275:50, col:99> swift 0 0 0 Unavailable "Use mkstemp(3) instead." ""`: testNode{&AvailabilityAttr{
-		testNode{&AvailabilityAttr{
 			Addr:          0x7fc5ff8f1988,
 			Pos:           NewPositionFromString("line:275:50, col:99"),
 			OS:            "swift",
@@ -114,8 +108,7 @@ func TestAvailabilityAttr(t *testing.T) {
 			NewPositionFromString("line:275:50, col:99"),
 			[]Node{},
 		},
-		`0x104035438 </usr/include/AvailabilityInternal.h:14571:88, col:124> macosx 10.10 0 0 ""`:
+		`0x104035438 </usr/include/AvailabilityInternal.h:14571:88, col:124> macosx 10.10 0 0 ""`: testNode{&AvailabilityAttr{
-		testNode{&AvailabilityAttr{
 			Addr:          0x104035438,
 			Pos:           NewPositionFromString("/usr/include/AvailabilityInternal.h:14571:88, col:124"),
 			OS:            "macosx",
@@ -132,8 +125,7 @@ func TestAvailabilityAttr(t *testing.T) {
 			NewPositionFromString("/usr/include/AvailabilityInternal.h:14571:88, col:124"),
 			[]Node{},
 		},
-		`0x7f9bd588b1a8 </usr/include/gethostuuid.h:39:65, col:100> Inherited macos 10.5 0 0 "" ""`:
+		`0x7f9bd588b1a8 </usr/include/gethostuuid.h:39:65, col:100> Inherited macos 10.5 0 0 "" ""`: testNode{&AvailabilityAttr{
-		testNode{&AvailabilityAttr{
 			Addr:          0x7f9bd588b1a8,
 			Pos:           NewPositionFromString("/usr/include/gethostuuid.h:39:65, col:100"),
 			OS:            "macos",

ast/binary_operator_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestBinaryOperator(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fca2d8070e0 <col:11, col:23> 'unsigned char' '='`:
+		`0x7fca2d8070e0 <col:11, col:23> 'unsigned char' '='`: testNode{&BinaryOperator{
-		testNode{&BinaryOperator{
 			Addr:       0x7fca2d8070e0,
 			Pos:        NewPositionFromString("col:11, col:23"),
 			Type:       "unsigned char",
@@ -18,8 +17,7 @@ func TestBinaryOperator(t *testing.T) {
 			NewPositionFromString("col:11, col:23"),
 			[]Node{},
 		},
-		`0x1ff95b8 <line:78:2, col:7> 'T_ENUM':'T_ENUM' '='`:
+		`0x1ff95b8 <line:78:2, col:7> 'T_ENUM':'T_ENUM' '='`: testNode{&BinaryOperator{
-		testNode{&BinaryOperator{
 			Addr:       0x1ff95b8,
 			Pos:        NewPositionFromString("line:78:2, col:7"),
 			Type:       "T_ENUM",

ast/block_command_comment_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestBlockCommandComment(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x1069fae60 <col:4, line:163:57> Name="abstract"`:
+		`0x1069fae60 <col:4, line:163:57> Name="abstract"`: testNode{&BlockCommandComment{
-		testNode{&BlockCommandComment{
 			Addr:       0x1069fae60,
 			Pos:        NewPositionFromString("col:4, line:163:57"),
 			Name:       "abstract",

ast/block_pointer_type_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestBlockPointerType(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fa3b88bbb30 'void (^)(void)'`:
+		`0x7fa3b88bbb30 'void (^)(void)'`: testNode{&BlockPointerType{
-		testNode{&BlockPointerType{
 			Addr:       0x7fa3b88bbb30,
 			Type:       `void (^)(void)`,
 			ChildNodes: []Node{},
@@ -16,8 +15,7 @@ func TestBlockPointerType(t *testing.T) {
 			NewPositionFromString(""),
 			[]Node{},
 		},
-		`0x7fa3b88bbb30 'NSComparisonResult (^)(id _Nonnull, id _Nonnull)'`:
+		`0x7fa3b88bbb30 'NSComparisonResult (^)(id _Nonnull, id _Nonnull)'`: testNode{&BlockPointerType{
-		testNode{&BlockPointerType{
 			Addr:       0x7fa3b88bbb30,
 			Type:       `NSComparisonResult (^)(id _Nonnull, id _Nonnull)`,
 			ChildNodes: []Node{},

ast/break_stmt_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestBreakStmt(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fca2d8070e0 <col:11, col:23>`:
+		`0x7fca2d8070e0 <col:11, col:23>`: testNode{&BreakStmt{
-		testNode{&BreakStmt{
 			Addr:       0x7fca2d8070e0,
 			Pos:        NewPositionFromString("col:11, col:23"),
 			ChildNodes: []Node{},

ast/builtin_type_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestBuiltinType(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f8a43023f40 '__int128'`:
+		`0x7f8a43023f40 '__int128'`: testNode{&BuiltinType{
-		testNode{&BuiltinType{
 			Addr:       0x7f8a43023f40,
 			Type:       "__int128",
 			ChildNodes: []Node{},
@@ -16,8 +15,7 @@ func TestBuiltinType(t *testing.T) {
 			NewPositionFromString(""),
 			[]Node{},
 		},
-		`0x7f8a43023ea0 'unsigned long long'`:
+		`0x7f8a43023ea0 'unsigned long long'`: testNode{&BuiltinType{
-		testNode{&BuiltinType{
 			Addr:       0x7f8a43023ea0,
 			Type:       "unsigned long long",
 			ChildNodes: []Node{},

ast/c_style_cast_expr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestCStyleCastExpr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fddc18fb2e0 <col:50, col:56> 'char' <IntegralCast>`:
+		`0x7fddc18fb2e0 <col:50, col:56> 'char' <IntegralCast>`: testNode{&CStyleCastExpr{
-		testNode{&CStyleCastExpr{
 			Addr:       0x7fddc18fb2e0,
 			Pos:        NewPositionFromString("col:50, col:56"),
 			Type:       "char",
@@ -18,8 +17,7 @@ func TestCStyleCastExpr(t *testing.T) {
 			NewPositionFromString("col:50, col:56"),
 			[]Node{},
 		},
-		`0x2781518 <col:7, col:17> 'T_ENUM':'T_ENUM' <IntegralCast>`:
+		`0x2781518 <col:7, col:17> 'T_ENUM':'T_ENUM' <IntegralCast>`: testNode{&CStyleCastExpr{
-		testNode{&CStyleCastExpr{
 			Addr:       0x2781518,
 			Pos:        NewPositionFromString("col:7, col:17"),
 			Type:       "T_ENUM",

ast/call_expr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestCallExpr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f9bf3033240 <col:11, col:25> 'int'`:
+		`0x7f9bf3033240 <col:11, col:25> 'int'`: testNode{&CallExpr{
-		testNode{&CallExpr{
 			Addr:       0x7f9bf3033240,
 			Pos:        NewPositionFromString("col:11, col:25"),
 			Type:       "int",
@@ -17,8 +16,7 @@ func TestCallExpr(t *testing.T) {
 			NewPositionFromString("col:11, col:25"),
 			[]Node{},
 		},
-		`0x7f9bf3035c20 <line:7:4, col:64> 'int'`:
+		`0x7f9bf3035c20 <line:7:4, col:64> 'int'`: testNode{&CallExpr{
-		testNode{&CallExpr{
 			Addr:       0x7f9bf3035c20,
 			Pos:        NewPositionFromString("line:7:4, col:64"),
 			Type:       "int",

ast/case_stmt_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestCaseStmt(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc8b5094688 <line:11:5, line:12:21>`:
+		`0x7fc8b5094688 <line:11:5, line:12:21>`: testNode{&CaseStmt{
-		testNode{&CaseStmt{
 			Addr:       0x7fc8b5094688,
 			Pos:        NewPositionFromString("line:11:5, line:12:21"),
 			ChildNodes: []Node{},

ast/cf_audited_transfer_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestCFAuditedTransferAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7> content`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7> content`: testNode{&CFAuditedTransferAttr{
-		testNode{&CFAuditedTransferAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			Content:    " content",

ast/cf_consumed_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestCFConsumedAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7> content`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7> content`: testNode{&CFConsumedAttr{
-		testNode{&CFConsumedAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			Content:    " content",

ast/cf_returns_not_retained_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestCFReturnsNotRetainedAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&CFReturnsNotRetainedAttr{
-		testNode{&CFReturnsNotRetainedAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/cf_returns_retained_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestCFReturnsRetainedAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&CFReturnsRetainedAttr{
-		testNode{&CFReturnsRetainedAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/character_literal_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestCharacterLiteral(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f980b858308 <col:62> 'int' 10`:
+		`0x7f980b858308 <col:62> 'int' 10`: testNode{&CharacterLiteral{
-		testNode{&CharacterLiteral{
 			Addr:       0x7f980b858308,
 			Pos:        NewPositionFromString("col:62"),
 			Type:       "int",

ast/compound_assign_operator_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestCompoundAssignOperator(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x2dc5758 <line:5:2, col:7> 'int' '+=' ComputeLHSTy='int' ComputeResultTy='int'`:
+		`0x2dc5758 <line:5:2, col:7> 'int' '+=' ComputeLHSTy='int' ComputeResultTy='int'`: testNode{&CompoundAssignOperator{
-		testNode{&CompoundAssignOperator{
 			Addr:                  0x2dc5758,
 			Pos:                   NewPositionFromString("line:5:2, col:7"),
 			Type:                  "int",

ast/compound_literal_expr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestCompoundLiteralExpr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x5575acce81f0 <col:21, col:40> 'struct node':'struct node' lvalue`:
+		`0x5575acce81f0 <col:21, col:40> 'struct node':'struct node' lvalue`: testNode{&CompoundLiteralExpr{
-		testNode{&CompoundLiteralExpr{
 			Addr:       0x5575acce81f0,
 			Pos:        NewPositionFromString("col:21, col:40"),
 			Type1:      "struct node",

ast/compound_stmt_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestCompoundStmt(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fbd0f014f18 <col:54, line:358:1>`:
+		`0x7fbd0f014f18 <col:54, line:358:1>`: testNode{&CompoundStmt{
-		testNode{&CompoundStmt{
 			Addr:       0x7fbd0f014f18,
 			Pos:        NewPositionFromString("col:54, line:358:1"),
 			ChildNodes: []Node{},
@@ -16,8 +15,7 @@ func TestCompoundStmt(t *testing.T) {
 			NewPositionFromString("col:54, line:358:1"),
 			[]Node{},
 		},
-		`0x7fbd0f8360b8 <line:4:1, line:13:1>`:
+		`0x7fbd0f8360b8 <line:4:1, line:13:1>`: testNode{&CompoundStmt{
-		testNode{&CompoundStmt{
 			Addr:       0x7fbd0f8360b8,
 			Pos:        NewPositionFromString("line:4:1, line:13:1"),
 			ChildNodes: []Node{},

ast/conditional_operator_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestConditionalOperator(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc6ae0bc678 <col:6, col:89> 'void'`:
+		`0x7fc6ae0bc678 <col:6, col:89> 'void'`: testNode{&ConditionalOperator{
-		testNode{&ConditionalOperator{
 			Addr:       0x7fc6ae0bc678,
 			Pos:        NewPositionFromString("col:6, col:89"),
 			Type:       "void",

ast/const_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestConstAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fa3b88bbb38 <line:4:1, line:13:1>foo`:
+		`0x7fa3b88bbb38 <line:4:1, line:13:1>foo`: testNode{&ConstAttr{
-		testNode{&ConstAttr{
 			Addr:       0x7fa3b88bbb38,
 			Pos:        NewPositionFromString("line:4:1, line:13:1"),
 			Tags:       "foo",

ast/constant_array_type_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestConstantArrayType(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f94ad016a40 'struct __va_list_tag [1]' 1 `:
+		`0x7f94ad016a40 'struct __va_list_tag [1]' 1 `: testNode{&ConstantArrayType{
-		testNode{&ConstantArrayType{
 			Addr:       0x7f94ad016a40,
 			Type:       "struct __va_list_tag [1]",
 			Size:       1,
@@ -17,8 +16,7 @@ func TestConstantArrayType(t *testing.T) {
 			NewPositionFromString(""),
 			[]Node{},
 		},
-		`0x7f8c5f059d20 'char [37]' 37 `:
+		`0x7f8c5f059d20 'char [37]' 37 `: testNode{&ConstantArrayType{
-		testNode{&ConstantArrayType{
 			Addr:       0x7f8c5f059d20,
 			Type:       "char [37]",
 			Size:       37,

ast/continue_stmt_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestContinueStmt(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x1e044e0 <col:20>`:
+		`0x1e044e0 <col:20>`: testNode{&ContinueStmt{
-		testNode{&ContinueStmt{
 			Addr:       0x1e044e0,
 			Pos:        NewPositionFromString("col:20"),
 			ChildNodes: []Node{},

ast/convert_vector_expr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestConvertVectorExpr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fdef0862430 <line:120:1, col:16>`:
+		`0x7fdef0862430 <line:120:1, col:16>`: testNode{&ConvertVectorExpr{
-		testNode{&ConvertVectorExpr{
 			Addr:       0x7fdef0862430,
 			Pos:        NewPositionFromString("line:120:1, col:16"),
 			Type:       "",
@@ -18,8 +17,7 @@ func TestConvertVectorExpr(t *testing.T) {
 			NewPositionFromString("line:120:1, col:16"),
 			[]Node{},
 		},
-		`0x113368318 <line:1354:20, line:1355:70> '__v2df':'__attribute__((__vector_size__(2 * sizeof(double)))) double'`:
+		`0x113368318 <line:1354:20, line:1355:70> '__v2df':'__attribute__((__vector_size__(2 * sizeof(double)))) double'`: testNode{&ConvertVectorExpr{
-		testNode{&ConvertVectorExpr{
 			Addr:       0x113368318,
 			Pos:        NewPositionFromString("line:1354:20, line:1355:70"),
 			Type:       `__v2df`,

ast/decayed_type_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestDecayedType(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f1234567890 'struct __va_list_tag *' sugar`:
+		`0x7f1234567890 'struct __va_list_tag *' sugar`: testNode{&DecayedType{
-		testNode{&DecayedType{
 			Addr:       0x7f1234567890,
 			Type:       "struct __va_list_tag *",
 			ChildNodes: []Node{},

ast/decl_ref_expr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestDeclRefExpr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc972064460 <col:8> 'FILE *' lvalue ParmVar 0x7fc9720642d0 '_p' 'FILE *'`:
+		`0x7fc972064460 <col:8> 'FILE *' lvalue ParmVar 0x7fc9720642d0 '_p' 'FILE *'`: testNode{&DeclRefExpr{
-		testNode{&DeclRefExpr{
 			Addr:       0x7fc972064460,
 			Pos:        NewPositionFromString("col:8"),
 			Type:       "FILE *",
@@ -24,8 +23,7 @@ func TestDeclRefExpr(t *testing.T) {
 			NewPositionFromString("col:8"),
 			[]Node{},
 		},
-		`0x7fc97206a958 <col:11> 'int (int, FILE *)' Function 0x7fc972064198 '__swbuf' 'int (int, FILE *)'`:
+		`0x7fc97206a958 <col:11> 'int (int, FILE *)' Function 0x7fc972064198 '__swbuf' 'int (int, FILE *)'`: testNode{&DeclRefExpr{
-		testNode{&DeclRefExpr{
 			Addr:       0x7fc97206a958,
 			Pos:        NewPositionFromString("col:11"),
 			Type:       "int (int, FILE *)",
@@ -42,8 +40,7 @@ func TestDeclRefExpr(t *testing.T) {
 			NewPositionFromString("col:11"),
 			[]Node{},
 		},
-		`0x7fa36680f170 <col:19> 'struct programming':'struct programming' lvalue Var 0x7fa36680dc20 'variable' 'struct programming':'struct programming'`:
+		`0x7fa36680f170 <col:19> 'struct programming':'struct programming' lvalue Var 0x7fa36680dc20 'variable' 'struct programming':'struct programming'`: testNode{&DeclRefExpr{
-		testNode{&DeclRefExpr{
 			Addr:       0x7fa36680f170,
 			Pos:        NewPositionFromString("col:19"),
 			Type:       "struct programming",
@@ -60,8 +57,7 @@ func TestDeclRefExpr(t *testing.T) {
 			NewPositionFromString("col:19"),
 			[]Node{},
 		},
-		`0x35cb438 <col:13> 'int' EnumConstant 0x35ca300 'Jan' 'int'`:
+		`0x35cb438 <col:13> 'int' EnumConstant 0x35ca300 'Jan' 'int'`: testNode{&DeclRefExpr{
-		testNode{&DeclRefExpr{
 			Addr:       0x35cb438,
 			Pos:        NewPositionFromString("col:13"),
 			Type:       "int",
@@ -78,8 +74,7 @@ func TestDeclRefExpr(t *testing.T) {
 			NewPositionFromString("col:13"),
 			[]Node{},
 		},
-		`0x1ff8770 <col:33> 'T_ENUM':'T_ENUM' lvalue Var 0x1ff8600 'cc' 'T_ENUM':'T_ENUM'`:
+		`0x1ff8770 <col:33> 'T_ENUM':'T_ENUM' lvalue Var 0x1ff8600 'cc' 'T_ENUM':'T_ENUM'`: testNode{&DeclRefExpr{
-		testNode{&DeclRefExpr{
 			Addr:       0x1ff8770,
 			Pos:        NewPositionFromString("col:33"),
 			Type:       "T_ENUM",

ast/decl_stmt_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestDeclStmt(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fb791846e80 <line:11:4, col:31>`:
+		`0x7fb791846e80 <line:11:4, col:31>`: testNode{&DeclStmt{
-		testNode{&DeclStmt{
 			Addr:       0x7fb791846e80,
 			Pos:        NewPositionFromString("line:11:4, col:31"),
 			ChildNodes: []Node{},

ast/default_stmt_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestDefaultStmt(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f951308bfb0 <line:17:5, line:18:34>`:
+		`0x7f951308bfb0 <line:17:5, line:18:34>`: testNode{&DefaultStmt{
-		testNode{&DefaultStmt{
 			Addr:       0x7f951308bfb0,
 			Pos:        NewPositionFromString("line:17:5, line:18:34"),
 			ChildNodes: []Node{},

ast/deprecated_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestDeprecatedAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fec4b0ab9c0 <line:180:48, col:63> "This function is provided for compatibility reasons only.  Due to security concerns inherent in the design of tempnam(3), it is highly recommended that you use mkstemp(3) instead." ""`:
+		`0x7fec4b0ab9c0 <line:180:48, col:63> "This function is provided for compatibility reasons only.  Due to security concerns inherent in the design of tempnam(3), it is highly recommended that you use mkstemp(3) instead." ""`: testNode{&DeprecatedAttr{
-		testNode{&DeprecatedAttr{
 			Addr:        0x7fec4b0ab9c0,
 			Pos:         NewPositionFromString("line:180:48, col:63"),
 			Message1:    "This function is provided for compatibility reasons only.  Due to security concerns inherent in the design of tempnam(3), it is highly recommended that you use mkstemp(3) instead.",
@@ -19,8 +18,7 @@ func TestDeprecatedAttr(t *testing.T) {
 			NewPositionFromString("line:180:48, col:63"),
 			[]Node{},
 		},
-		`0xb75d00 <line:1107:12> "This function or variable may be unsafe. Consider using _snwprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details." ""`:
+		`0xb75d00 <line:1107:12> "This function or variable may be unsafe. Consider using _snwprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details." ""`: testNode{&DeprecatedAttr{
-		testNode{&DeprecatedAttr{
 			Addr:        0xb75d00,
 			Pos:         NewPositionFromString("line:1107:12"),
 			Message1:    "This function or variable may be unsafe. Consider using _snwprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.",
@@ -32,8 +30,7 @@ func TestDeprecatedAttr(t *testing.T) {
 			NewPositionFromString("line:1107:12"),
 			[]Node{},
 		},
-		`0xb75d00 <line:1107:12> Inherited "This function or variable may be unsafe. Consider using _snwprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details." ""`:
+		`0xb75d00 <line:1107:12> Inherited "This function or variable may be unsafe. Consider using _snwprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details." ""`: testNode{&DeprecatedAttr{
-		testNode{&DeprecatedAttr{
 			Addr:        0xb75d00,
 			Pos:         NewPositionFromString("line:1107:12"),
 			Message1:    "This function or variable may be unsafe. Consider using _snwprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.",

ast/disable_tail_calls_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestDisableTailCallsAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc8fa094558 <col:107> `:
+		`0x7fc8fa094558 <col:107> `: testNode{&DisableTailCallsAttr{
-		testNode{&DisableTailCallsAttr{
 			Addr:       0x7fc8fa094558,
 			Pos:        NewPositionFromString("col:107"),
 			ChildNodes: []Node{},

ast/do_stmt_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestDoStmt(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7ff36d0a0938 <line:11:5, line:14:23>`:
+		`0x7ff36d0a0938 <line:11:5, line:14:23>`: testNode{&DoStmt{
-		testNode{&DoStmt{
 			Addr:       0x7ff36d0a0938,
 			Pos:        NewPositionFromString("line:11:5, line:14:23"),
 			ChildNodes: []Node{},

ast/elaborated_type_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestElaboratedType(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f873686c120 'union __mbstate_t' sugar`:
+		`0x7f873686c120 'union __mbstate_t' sugar`: testNode{&ElaboratedType{
-		testNode{&ElaboratedType{
 			Addr:       0x7f873686c120,
 			Type:       "union __mbstate_t",
 			Tags:       "sugar",

ast/empty_decl_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestEmptyDecl(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x480bec8 <col:13> col:13`:
+		`0x480bec8 <col:13> col:13`: testNode{&EmptyDecl{
-		testNode{&EmptyDecl{
 			Addr:       0x480bec8,
 			Pos:        NewPositionFromString("col:13"),
 			Position2:  NewPositionFromString("col:13"),

ast/enum_constant_decl_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestEnumConstantDecl(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x1660db0 <line:185:3> __codecvt_noconv 'int'`:
+		`0x1660db0 <line:185:3> __codecvt_noconv 'int'`: testNode{&EnumConstantDecl{
-		testNode{&EnumConstantDecl{
 			Addr:       0x1660db0,
 			Pos:        NewPositionFromString("line:185:3"),
 			Position2:  "",
@@ -20,8 +19,7 @@ func TestEnumConstantDecl(t *testing.T) {
 			NewPositionFromString("line:185:3"),
 			[]Node{},
 		},
-		`0x3c77ba8 <line:59:3, col:65> col:3 referenced _ISalnum 'int'`:
+		`0x3c77ba8 <line:59:3, col:65> col:3 referenced _ISalnum 'int'`: testNode{&EnumConstantDecl{
-		testNode{&EnumConstantDecl{
 			Addr:       0x3c77ba8,
 			Pos:        NewPositionFromString("line:59:3, col:65"),
 			Position2:  "col:3",

ast/enum_decl_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestEnumDecl(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x22a6c80 <line:180:1, line:186:1> __codecvt_result`:
+		`0x22a6c80 <line:180:1, line:186:1> __codecvt_result`: testNode{&EnumDecl{
-		testNode{&EnumDecl{
 			Addr:       0x22a6c80,
 			Pos:        NewPositionFromString("line:180:1, line:186:1"),
 			Position2:  "",
@@ -18,8 +17,7 @@ func TestEnumDecl(t *testing.T) {
 			NewPositionFromString("line:180:1, line:186:1"),
 			[]Node{},
 		},
-		`0x32fb5a0 <enum.c:3:1, col:45> col:6 week`:
+		`0x32fb5a0 <enum.c:3:1, col:45> col:6 week`: testNode{&EnumDecl{
-		testNode{&EnumDecl{
 			Addr:       0x32fb5a0,
 			Pos:        NewPositionFromString("enum.c:3:1, col:45"),
 			Position2:  " col:6",

ast/enum_extensibility_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestEnumExtensibilityAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7> content`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7> content`: testNode{&EnumExtensibilityAttr{
-		testNode{&EnumExtensibilityAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			Content:    " content",

ast/enum_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestEnum(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f980b858308 'foo'`:
+		`0x7f980b858308 'foo'`: testNode{&Enum{
-		testNode{&Enum{
 			Addr:       0x7f980b858308,
 			Name:       "foo",
 			ChildNodes: []Node{},

ast/enum_type_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestEnumType(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f980b858309 'foo'`:
+		`0x7f980b858309 'foo'`: testNode{&EnumType{
-		testNode{&EnumType{
 			Addr:       0x7f980b858309,
 			Name:       "foo",
 			ChildNodes: []Node{},

ast/field_decl_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestFieldDecl(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fef510c4848 <line:141:2, col:6> col:6 _ur 'int'`:
+		`0x7fef510c4848 <line:141:2, col:6> col:6 _ur 'int'`: testNode{&FieldDecl{
-		testNode{&FieldDecl{
 			Addr:       0x7fef510c4848,
 			Pos:        NewPositionFromString("line:141:2, col:6"),
 			Position2:  "col:6",
@@ -22,8 +21,7 @@ func TestFieldDecl(t *testing.T) {
 			NewPositionFromString("line:141:2, col:6"),
 			[]Node{},
 		},
-		`0x7fef510c46f8 <line:139:2, col:16> col:16 _ub 'struct __sbuf':'struct __sbuf'`:
+		`0x7fef510c46f8 <line:139:2, col:16> col:16 _ub 'struct __sbuf':'struct __sbuf'`: testNode{&FieldDecl{
-		testNode{&FieldDecl{
 			Addr:       0x7fef510c46f8,
 			Pos:        NewPositionFromString("line:139:2, col:16"),
 			Position2:  "col:16",
@@ -38,8 +36,7 @@ func TestFieldDecl(t *testing.T) {
 			NewPositionFromString("line:139:2, col:16"),
 			[]Node{},
 		},
-		`0x7fef510c3fe0 <line:134:2, col:19> col:19 _read 'int (* _Nullable)(void *, char *, int)':'int (*)(void *, char *, int)'`:
+		`0x7fef510c3fe0 <line:134:2, col:19> col:19 _read 'int (* _Nullable)(void *, char *, int)':'int (*)(void *, char *, int)'`: testNode{&FieldDecl{
-		testNode{&FieldDecl{
 			Addr:       0x7fef510c3fe0,
 			Pos:        NewPositionFromString("line:134:2, col:19"),
 			Position2:  "col:19",
@@ -54,8 +51,7 @@ func TestFieldDecl(t *testing.T) {
 			NewPositionFromString("line:134:2, col:19"),
 			[]Node{},
 		},
-		`0x7fef51073a60 <line:105:2, col:40> col:40 __cleanup_stack 'struct __darwin_pthread_handler_rec *'`:
+		`0x7fef51073a60 <line:105:2, col:40> col:40 __cleanup_stack 'struct __darwin_pthread_handler_rec *'`: testNode{&FieldDecl{
-		testNode{&FieldDecl{
 			Addr:       0x7fef51073a60,
 			Pos:        NewPositionFromString("line:105:2, col:40"),
 			Position2:  "col:40",
@@ -70,8 +66,7 @@ func TestFieldDecl(t *testing.T) {
 			NewPositionFromString("line:105:2, col:40"),
 			[]Node{},
 		},
-		`0x7fef510738e8 <line:100:2, col:43> col:7 __opaque 'char [16]'`:
+		`0x7fef510738e8 <line:100:2, col:43> col:7 __opaque 'char [16]'`: testNode{&FieldDecl{
-		testNode{&FieldDecl{
 			Addr:       0x7fef510738e8,
 			Pos:        NewPositionFromString("line:100:2, col:43"),
 			Position2:  "col:7",
@@ -86,8 +81,7 @@ func TestFieldDecl(t *testing.T) {
 			NewPositionFromString("line:100:2, col:43"),
 			[]Node{},
 		},
-		`0x7fe9f5072268 <line:129:2, col:6> col:6 referenced _lbfsize 'int'`:
+		`0x7fe9f5072268 <line:129:2, col:6> col:6 referenced _lbfsize 'int'`: testNode{&FieldDecl{
-		testNode{&FieldDecl{
 			Addr:       0x7fe9f5072268,
 			Pos:        NewPositionFromString("line:129:2, col:6"),
 			Position2:  "col:6",
@@ -102,8 +96,7 @@ func TestFieldDecl(t *testing.T) {
 			NewPositionFromString("line:129:2, col:6"),
 			[]Node{},
 		},
-		`0x7f9bc9083d00 <line:91:5, line:97:8> line:91:5 'unsigned short'`:
+		`0x7f9bc9083d00 <line:91:5, line:97:8> line:91:5 'unsigned short'`: testNode{&FieldDecl{
-		testNode{&FieldDecl{
 			Addr:       0x7f9bc9083d00,
 			Pos:        NewPositionFromString("line:91:5, line:97:8"),
 			Position2:  "line:91:5",
@@ -118,8 +111,7 @@ func TestFieldDecl(t *testing.T) {
 			NewPositionFromString("line:91:5, line:97:8"),
 			[]Node{},
 		},
-		`0x30363a0 <col:18, col:29> __val 'int [2]'`:
+		`0x30363a0 <col:18, col:29> __val 'int [2]'`: testNode{&FieldDecl{
-		testNode{&FieldDecl{
 			Addr:       0x30363a0,
 			Pos:        NewPositionFromString("col:18, col:29"),
 			Position2:  "",
@@ -134,8 +126,7 @@ func TestFieldDecl(t *testing.T) {
 			NewPositionFromString("col:18, col:29"),
 			[]Node{},
 		},
-		`0x17aeac0 <line:3:9> col:9 implicit referenced 'struct vec3d_t::(anonymous at main.c:3:9)'`:
+		`0x17aeac0 <line:3:9> col:9 implicit referenced 'struct vec3d_t::(anonymous at main.c:3:9)'`: testNode{&FieldDecl{
-		testNode{&FieldDecl{
 			Addr:       0x17aeac0,
 			Pos:        NewPositionFromString("line:3:9"),
 			Position2:  "col:9",
@@ -150,8 +141,7 @@ func TestFieldDecl(t *testing.T) {
 			NewPositionFromString("line:3:9"),
 			[]Node{},
 		},
-		`0x56498bf52160 <line:269:5, col:21> col:21 type 'enum __pid_type':'enum __pid_type'`:
+		`0x56498bf52160 <line:269:5, col:21> col:21 type 'enum __pid_type':'enum __pid_type'`: testNode{&FieldDecl{
-		testNode{&FieldDecl{
 			Addr:       0x56498bf52160,
 			Pos:        NewPositionFromString("line:269:5, col:21"),
 			Position2:  "col:21",

ast/field_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestField(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x44159a0 '' 'union sigcontext::(anonymous at /usr/include/x86_64-linux-gnu/bits/sigcontext.h:165:17)'`:
+		`0x44159a0 '' 'union sigcontext::(anonymous at /usr/include/x86_64-linux-gnu/bits/sigcontext.h:165:17)'`: testNode{&Field{
-		testNode{&Field{
 			Addr:       0x44159a0,
 			String1:    "",
 			String2:    "union sigcontext::(anonymous at /usr/include/x86_64-linux-gnu/bits/sigcontext.h:165:17)",

ast/flag_enum_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestFlagEnumAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7> content`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7> content`: testNode{&FlagEnumAttr{
-		testNode{&FlagEnumAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			Content:    " content",

ast/floating_literal.go

@@ -1,11 +1,11 @@
 package ast
 
 import (
-	//"errors"
+//"errors"
-	//"fmt"
+//"fmt"
-	//"reflect"
+//"reflect"
 
-	//"github.com/elliotchance/c2go/cc"
+//"github.com/elliotchance/c2go/cc"
 )
 
 // FloatingLiteral is type of float literal

ast/floating_literal_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestFloatingLiteral(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7febe106f5e8 <col:24> 'double' 1.230000e+00`:
+		`0x7febe106f5e8 <col:24> 'double' 1.230000e+00`: testNode{&FloatingLiteral{
-		testNode{&FloatingLiteral{
 			Addr:       0x7febe106f5e8,
 			Pos:        NewPositionFromString("col:24"),
 			Type:       "double",
@@ -18,8 +17,7 @@ func TestFloatingLiteral(t *testing.T) {
 			NewPositionFromString("col:24"),
 			[]Node{},
 		},
-		`0x21c65b8 <col:41> 'double' 2.718282e+00`:
+		`0x21c65b8 <col:41> 'double' 2.718282e+00`: testNode{&FloatingLiteral{
-		testNode{&FloatingLiteral{
 			Addr:       0x21c65b8,
 			Pos:        NewPositionFromString("col:41"),
 			Type:       "double",

ast/for_stmt_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestForStmt(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f961e018848 <line:9:4, line:10:70>`:
+		`0x7f961e018848 <line:9:4, line:10:70>`: testNode{&ForStmt{
-		testNode{&ForStmt{
 			Addr:       0x7f961e018848,
 			Pos:        NewPositionFromString("line:9:4, line:10:70"),
 			ChildNodes: []Node{},

ast/format_arg_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestFormatArgAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f1234567890 <col:47, col:57> 1`:
+		`0x7f1234567890 <col:47, col:57> 1`: testNode{&FormatArgAttr{
-		testNode{&FormatArgAttr{
 			Addr:       0x7f1234567890,
 			Pos:        NewPositionFromString("col:47, col:57"),
 			Arg:        "1",

ast/format_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestFormatAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fcc8d8ecee8 <col:6> Implicit printf 2 3`:
+		`0x7fcc8d8ecee8 <col:6> Implicit printf 2 3`: testNode{&FormatAttr{
-		testNode{&FormatAttr{
 			Addr:         0x7fcc8d8ecee8,
 			Pos:          NewPositionFromString("col:6"),
 			Implicit:     true,
@@ -21,8 +20,7 @@ func TestFormatAttr(t *testing.T) {
 			NewPositionFromString("col:6"),
 			[]Node{},
 		},
-		`0x7fcc8d8ecff8 </usr/include/sys/cdefs.h:351:18, col:61> printf 2 3`:
+		`0x7fcc8d8ecff8 </usr/include/sys/cdefs.h:351:18, col:61> printf 2 3`: testNode{&FormatAttr{
-		testNode{&FormatAttr{
 			Addr:         0x7fcc8d8ecff8,
 			Pos:          NewPositionFromString("/usr/include/sys/cdefs.h:351:18, col:61"),
 			Implicit:     false,
@@ -36,8 +34,7 @@ func TestFormatAttr(t *testing.T) {
 			NewPositionFromString("/usr/include/sys/cdefs.h:351:18, col:61"),
 			[]Node{},
 		},
-		`0x273b4d0 <line:357:12> Inherited printf 2 3`:
+		`0x273b4d0 <line:357:12> Inherited printf 2 3`: testNode{&FormatAttr{
-		testNode{&FormatAttr{
 			Addr:         0x273b4d0,
 			Pos:          NewPositionFromString("line:357:12"),
 			Implicit:     false,

ast/full_comment_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestFullComment(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x3860920 <line:10176:4, line:10180:45>`:
+		`0x3860920 <line:10176:4, line:10180:45>`: testNode{&FullComment{
-		testNode{&FullComment{
 			Addr:       0x3860920,
 			Pos:        NewPositionFromString("line:10176:4, line:10180:45"),
 			ChildNodes: []Node{},

ast/function_decl_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestFunctionDecl(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fb5a90e60d0 <line:231:1, col:22> col:7 clearerr 'void (FILE *)'`:
+		`0x7fb5a90e60d0 <line:231:1, col:22> col:7 clearerr 'void (FILE *)'`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x7fb5a90e60d0,
 			Pos:          NewPositionFromString("line:231:1, col:22"),
 			Prev:         "",
@@ -27,8 +26,7 @@ func TestFunctionDecl(t *testing.T) {
 			NewPositionFromString("line:231:1, col:22"),
 			[]Node{},
 		},
-		`0x7fb5a90e2a50 </usr/include/sys/stdio.h:39:1, /usr/include/AvailabilityInternal.h:21697:126> /usr/include/sys/stdio.h:39:5 renameat 'int (int, const char *, int, const char *)'`:
+		`0x7fb5a90e2a50 </usr/include/sys/stdio.h:39:1, /usr/include/AvailabilityInternal.h:21697:126> /usr/include/sys/stdio.h:39:5 renameat 'int (int, const char *, int, const char *)'`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x7fb5a90e2a50,
 			Pos:          NewPositionFromString("/usr/include/sys/stdio.h:39:1, /usr/include/AvailabilityInternal.h:21697:126"),
 			Prev:         "",
@@ -48,8 +46,7 @@ func TestFunctionDecl(t *testing.T) {
 			NewPositionFromString("/usr/include/sys/stdio.h:39:1, /usr/include/AvailabilityInternal.h:21697:126"),
 			[]Node{},
 		},
-		`0x7fb5a90e9b70 </usr/include/stdio.h:244:6> col:6 implicit fprintf 'int (FILE *, const char *, ...)' extern`:
+		`0x7fb5a90e9b70 </usr/include/stdio.h:244:6> col:6 implicit fprintf 'int (FILE *, const char *, ...)' extern`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x7fb5a90e9b70,
 			Pos:          NewPositionFromString("/usr/include/stdio.h:244:6"),
 			Prev:         "",
@@ -69,8 +66,7 @@ func TestFunctionDecl(t *testing.T) {
 			NewPositionFromString("/usr/include/stdio.h:244:6"),
 			[]Node{},
 		},
-		`0x7fb5a90e9d40 prev 0x7fb5a90e9b70 <col:1, /usr/include/sys/cdefs.h:351:63> /usr/include/stdio.h:244:6 fprintf 'int (FILE *, const char *, ...)'`:
+		`0x7fb5a90e9d40 prev 0x7fb5a90e9b70 <col:1, /usr/include/sys/cdefs.h:351:63> /usr/include/stdio.h:244:6 fprintf 'int (FILE *, const char *, ...)'`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x7fb5a90e9d40,
 			Pos:          NewPositionFromString("col:1, /usr/include/sys/cdefs.h:351:63"),
 			Prev:         "0x7fb5a90e9b70",
@@ -90,8 +86,7 @@ func TestFunctionDecl(t *testing.T) {
 			NewPositionFromString("col:1, /usr/include/sys/cdefs.h:351:63"),
 			[]Node{},
 		},
-		`0x7fb5a90ec210 <line:259:6> col:6 implicit used printf 'int (const char *, ...)' extern`:
+		`0x7fb5a90ec210 <line:259:6> col:6 implicit used printf 'int (const char *, ...)' extern`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x7fb5a90ec210,
 			Pos:          NewPositionFromString("line:259:6"),
 			Prev:         "",
@@ -111,8 +106,7 @@ func TestFunctionDecl(t *testing.T) {
 			NewPositionFromString("line:259:6"),
 			[]Node{},
 		},
-		`0x2ae30d8 </usr/include/math.h:65:3, /usr/include/x86_64-linux-gnu/sys/cdefs.h:57:54> <scratch space>:17:1 __acos 'double (double)' extern`:
+		`0x2ae30d8 </usr/include/math.h:65:3, /usr/include/x86_64-linux-gnu/sys/cdefs.h:57:54> <scratch space>:17:1 __acos 'double (double)' extern`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x2ae30d8,
 			Pos:          NewPositionFromString("/usr/include/math.h:65:3, /usr/include/x86_64-linux-gnu/sys/cdefs.h:57:54"),
 			Prev:         "",
@@ -132,8 +126,7 @@ func TestFunctionDecl(t *testing.T) {
 			NewPositionFromString("/usr/include/math.h:65:3, /usr/include/x86_64-linux-gnu/sys/cdefs.h:57:54"),
 			[]Node{},
 		},
-		`0x7fc595071500 <line:26:1, line:69:1> line:26:5 referenced main 'int (int, char **)'`:
+		`0x7fc595071500 <line:26:1, line:69:1> line:26:5 referenced main 'int (int, char **)'`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x7fc595071500,
 			Pos:          NewPositionFromString("line:26:1, line:69:1"),
 			Prev:         "",
@@ -153,8 +146,7 @@ func TestFunctionDecl(t *testing.T) {
 			NewPositionFromString("line:26:1, line:69:1"),
 			[]Node{},
 		},
-		`0x55973a008cb0 <line:93619:1, line:93630:1> line:93619:12 used exprIsConst 'int (Expr *, int, int)' static`:
+		`0x55973a008cb0 <line:93619:1, line:93630:1> line:93619:12 used exprIsConst 'int (Expr *, int, int)' static`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x55973a008cb0,
 			Pos:          NewPositionFromString("line:93619:1, line:93630:1"),
 			Prev:         "",
@@ -174,8 +166,7 @@ func TestFunctionDecl(t *testing.T) {
 			NewPositionFromString("line:93619:1, line:93630:1"),
 			[]Node{},
 		},
-		`0x563ade547cb8 <safe_math.h:13:1, line:25:1> line:14:2 safe_unary_minus_func_int8_t_s 'int8_t (int8_t)':'int8_t (int8_t)' static`:
+		`0x563ade547cb8 <safe_math.h:13:1, line:25:1> line:14:2 safe_unary_minus_func_int8_t_s 'int8_t (int8_t)':'int8_t (int8_t)' static`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x563ade547cb8,
 			Pos:          NewPositionFromString("safe_math.h:13:1, line:25:1"),
 			Prev:         "",
@@ -195,8 +186,7 @@ func TestFunctionDecl(t *testing.T) {
 			NewPositionFromString("safe_math.h:13:1, line:25:1"),
 			[]Node{},
 		},
-		`0x556cac571be0 <tests/asm.c:9:1, line:13:1> line:9:26 sqlite3Hwtime1 'unsigned long (void)' inline`:
+		`0x556cac571be0 <tests/asm.c:9:1, line:13:1> line:9:26 sqlite3Hwtime1 'unsigned long (void)' inline`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x556cac571be0,
 			Pos:          NewPositionFromString("tests/asm.c:9:1, line:13:1"),
 			Prev:         "",
@@ -216,8 +206,7 @@ func TestFunctionDecl(t *testing.T) {
 			NewPositionFromString("tests/asm.c:9:1, line:13:1"),
 			[]Node{},
 		},
-		`0x21c3da0 <line:8201:1, line:8786:1> line:8201:25 used insertvertex 'enum insertvertexresult (struct mesh *, struct behavior *, vertex, struct otri *, struct osub *, int, int)'`:
+		`0x21c3da0 <line:8201:1, line:8786:1> line:8201:25 used insertvertex 'enum insertvertexresult (struct mesh *, struct behavior *, vertex, struct otri *, struct osub *, int, int)'`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x21c3da0,
 			Pos:          NewPositionFromString("line:8201:1, line:8786:1"),
 			Prev:         "",
@@ -237,8 +226,7 @@ func TestFunctionDecl(t *testing.T) {
 			NewPositionFromString("line:8201:1, line:8786:1"),
 			[]Node{},
 		},
-		`0x30bdba8 parent 0x304fbb0 <col:3, col:38> col:30 used getinfo 'enum countries ()'`:
+		`0x30bdba8 parent 0x304fbb0 <col:3, col:38> col:30 used getinfo 'enum countries ()'`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x30bdba8,
 			Pos:          NewPositionFromString("col:3, col:38"),
 			Prev:         "",
@@ -259,8 +247,7 @@ func TestFunctionDecl(t *testing.T) {
 			NewPositionFromString("col:3, col:38"),
 			[]Node{},
 		},
-		`0x353d3b8 parent 0x31e9ba0 prev 0x33b0810 <col:2, col:30> col:22 used dmatrix 'double **(long, long, long, long)'`:
+		`0x353d3b8 parent 0x31e9ba0 prev 0x33b0810 <col:2, col:30> col:22 used dmatrix 'double **(long, long, long, long)'`: testNode{&FunctionDecl{
-		testNode{&FunctionDecl{
 			Addr:         0x353d3b8,
 			Pos:          NewPositionFromString("col:2, col:30"),
 			Prev:         "0x33b0810",

ast/function_proto_type_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestFunctionProtoType(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fa3b88bbb30 'struct _opaque_pthread_t *' foo`:
+		`0x7fa3b88bbb30 'struct _opaque_pthread_t *' foo`: testNode{&FunctionProtoType{
-		testNode{&FunctionProtoType{
 			Addr:       0x7fa3b88bbb30,
 			Type:       "struct _opaque_pthread_t *",
 			Kind:       "foo",

ast/gcc_asm_stmt_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestGCCAsmStmtStmt(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fad830c9e38 <line:13:5, col:57>`:
+		`0x7fad830c9e38 <line:13:5, col:57>`: testNode{&GCCAsmStmt{
-		testNode{&GCCAsmStmt{
 			Addr:       0x7fad830c9e38,
 			Pos:        NewPositionFromString("line:13:5, col:57"),
 			ChildNodes: []Node{},

ast/go_stmt_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestGotoStmt(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fb9cc1994d8 <line:18893:9, col:14> 'end_getDigits' 0x7fb9cc199490`:
+		`0x7fb9cc1994d8 <line:18893:9, col:14> 'end_getDigits' 0x7fb9cc199490`: testNode{&GotoStmt{
-		testNode{&GotoStmt{
 			Addr:       0x7fb9cc1994d8,
 			Pos:        NewPositionFromString("line:18893:9, col:14"),
 			Name:       "end_getDigits",

ast/html_end_tag_comment_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestHTMLEndTagComment(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x4259670 <col:27, col:30> Name="i"`:
+		`0x4259670 <col:27, col:30> Name="i"`: testNode{&HTMLEndTagComment{
-		testNode{&HTMLEndTagComment{
 			Addr:       0x4259670,
 			Pos:        NewPositionFromString("col:27, col:30"),
 			Name:       "i",

ast/html_start_tag_comment_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestHTMLStartTagComment(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x4259670 <col:27, col:30> Name="i"`:
+		`0x4259670 <col:27, col:30> Name="i"`: testNode{&HTMLStartTagComment{
-		testNode{&HTMLStartTagComment{
 			Addr:       0x4259670,
 			Pos:        NewPositionFromString("col:27, col:30"),
 			Name:       "i",

ast/ib_action_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestIBActionAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&IBActionAttr{
-		testNode{&IBActionAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/ib_outlet_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestIBOutletAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&IBOutletAttr{
-		testNode{&IBOutletAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/if_stmt_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestIfStmt(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d0 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d0 <line:11:7, line:18:7>`: testNode{&IfStmt{
-		testNode{&IfStmt{
 			Addr:       0x7fc0a69091d0,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/implicit_cast_expr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestImplicitCastExpr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f9f5b0a1288 <col:8> 'FILE *' <LValueToRValue>`:
+		`0x7f9f5b0a1288 <col:8> 'FILE *' <LValueToRValue>`: testNode{&ImplicitCastExpr{
-		testNode{&ImplicitCastExpr{
 			Addr:       0x7f9f5b0a1288,
 			Pos:        NewPositionFromString("col:8"),
 			Type:       "FILE *",
@@ -18,8 +17,7 @@ func TestImplicitCastExpr(t *testing.T) {
 			NewPositionFromString("col:8"),
 			[]Node{},
 		},
-		`0x7f9f5b0a7828 <col:11> 'int (*)(int, FILE *)' <FunctionToPointerDecay>`:
+		`0x7f9f5b0a7828 <col:11> 'int (*)(int, FILE *)' <FunctionToPointerDecay>`: testNode{&ImplicitCastExpr{
-		testNode{&ImplicitCastExpr{
 			Addr:       0x7f9f5b0a7828,
 			Pos:        NewPositionFromString("col:11"),
 			Type:       "int (*)(int, FILE *)",
@@ -30,8 +28,7 @@ func TestImplicitCastExpr(t *testing.T) {
 			NewPositionFromString("col:11"),
 			[]Node{},
 		},
-		`0x21267c8 <col:8> 'enum week1':'enum week2' <IntegralCast>`:
+		`0x21267c8 <col:8> 'enum week1':'enum week2' <IntegralCast>`: testNode{&ImplicitCastExpr{
-		testNode{&ImplicitCastExpr{
 			Addr:       0x21267c8,
 			Pos:        NewPositionFromString("col:8"),
 			Type:       "enum week1",
@@ -43,8 +40,7 @@ func TestImplicitCastExpr(t *testing.T) {
 			NewPositionFromString("col:8"),
 			[]Node{},
 		},
-		`0x26fd2d8 <col:20, col:32> 'extCoord':'extCoord' <LValueToRValue>`:
+		`0x26fd2d8 <col:20, col:32> 'extCoord':'extCoord' <LValueToRValue>`: testNode{&ImplicitCastExpr{
-		testNode{&ImplicitCastExpr{
 			Addr:       0x26fd2d8,
 			Pos:        NewPositionFromString("col:20, col:32"),
 			Type:       "extCoord",

ast/implicit_value_init_expr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestImplicitValueInitExpr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f8c3396fbd8 <<invalid sloc>> 'sqlite3StatValueType':'long long'`:
+		`0x7f8c3396fbd8 <<invalid sloc>> 'sqlite3StatValueType':'long long'`: testNode{&ImplicitValueInitExpr{
-		testNode{&ImplicitValueInitExpr{
 			Addr:       0x7f8c3396fbd8,
 			Pos:        NewPositionFromString("<invalid sloc>"),
 			Type1:      "sqlite3StatValueType",
@@ -18,8 +17,7 @@ func TestImplicitValueInitExpr(t *testing.T) {
 			NewPositionFromString("<invalid sloc>"),
 			[]Node{},
 		},
-		`0x7feecb0d6af0 <<invalid sloc>> 'char'`:
+		`0x7feecb0d6af0 <<invalid sloc>> 'char'`: testNode{&ImplicitValueInitExpr{
-		testNode{&ImplicitValueInitExpr{
 			Addr:       0x7feecb0d6af0,
 			Pos:        NewPositionFromString("<invalid sloc>"),
 			Type1:      "char",

ast/incomplete_array_type_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestIncompleteArrayType(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fcb7d005c20 'int []' `:
+		`0x7fcb7d005c20 'int []' `: testNode{&IncompleteArrayType{
-		testNode{&IncompleteArrayType{
 			Addr:       0x7fcb7d005c20,
 			Type:       "int []",
 			ChildNodes: []Node{},

ast/indirect_field_decl_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestIndirectFieldDecl(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x2be19a8 <line:167:25> col:25 implicit fpstate 'struct _fpstate *'`:
+		`0x2be19a8 <line:167:25> col:25 implicit fpstate 'struct _fpstate *'`: testNode{&IndirectFieldDecl{
-		testNode{&IndirectFieldDecl{
 			Addr:       0x2be19a8,
 			Pos:        NewPositionFromString("line:167:25"),
 			Position2:  "col:25",

ast/init_list_expr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestInitListExpr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fbdd1906c20 <col:52, line:17160:1> 'const unsigned char [256]'`:
+		`0x7fbdd1906c20 <col:52, line:17160:1> 'const unsigned char [256]'`: testNode{&InitListExpr{
-		testNode{&InitListExpr{
 			Addr:       0x7fbdd1906c20,
 			Pos:        NewPositionFromString("col:52, line:17160:1"),
 			Type1:      "const unsigned char [256]",
@@ -17,8 +16,7 @@ func TestInitListExpr(t *testing.T) {
 			NewPositionFromString("col:52, line:17160:1"),
 			[]Node{},
 		},
-		`0x32017f0 <col:24, col:41> 'struct node [2]'`:
+		`0x32017f0 <col:24, col:41> 'struct node [2]'`: testNode{&InitListExpr{
-		testNode{&InitListExpr{
 			Addr:       0x32017f0,
 			Pos:        NewPositionFromString("col:24, col:41"),
 			Type1:      "struct node [2]",
@@ -28,8 +26,7 @@ func TestInitListExpr(t *testing.T) {
 			NewPositionFromString("col:24, col:41"),
 			[]Node{},
 		},
-		`0x3201840 <col:25, col:31> 'struct node':'struct node'`:
+		`0x3201840 <col:25, col:31> 'struct node':'struct node'`: testNode{&InitListExpr{
-		testNode{&InitListExpr{
 			Addr:       0x3201840,
 			Pos:        NewPositionFromString("col:25, col:31"),
 			Type1:      "struct node",

ast/inline_command_comment_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestInlineCommandComment(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x22e3510 <col:2, col:6> Name="NOTE" RenderNormal`:
+		`0x22e3510 <col:2, col:6> Name="NOTE" RenderNormal`: testNode{&InlineCommandComment{
-		testNode{&InlineCommandComment{
 			Addr:       0x22e3510,
 			Pos:        NewPositionFromString("col:2, col:6"),
 			Other:      "Name=\"NOTE\" RenderNormal",

ast/integer_literal_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestIntegerLiteral(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fbe9804bcc8 <col:14> 'int' 1`:
+		`0x7fbe9804bcc8 <col:14> 'int' 1`: testNode{&IntegerLiteral{
-		testNode{&IntegerLiteral{
 			Addr:       0x7fbe9804bcc8,
 			Pos:        NewPositionFromString("col:14"),
 			Type:       "int",

ast/label_stmt_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestLabelStmt(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fe3ba82edb8 <line:18906:1, line:18907:22> 'end_getDigits'`:
+		`0x7fe3ba82edb8 <line:18906:1, line:18907:22> 'end_getDigits'`: testNode{&LabelStmt{
-		testNode{&LabelStmt{
 			Addr:       0x7fe3ba82edb8,
 			Pos:        NewPositionFromString("line:18906:1, line:18907:22"),
 			Name:       "end_getDigits",

ast/malloc_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestMallocAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&MallocAttr{
-		testNode{&MallocAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/max_field_alignment_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestMaxFieldAlignmentAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fd4b7063ac0 <<invalid sloc>> Implicit 32`:
+		`0x7fd4b7063ac0 <<invalid sloc>> Implicit 32`: testNode{&MaxFieldAlignmentAttr{
-		testNode{&MaxFieldAlignmentAttr{
 			Addr:       0x7fd4b7063ac0,
 			Pos:        NewPositionFromString("<invalid sloc>"),
 			Size:       32,
@@ -17,8 +16,7 @@ func TestMaxFieldAlignmentAttr(t *testing.T) {
 			NewPositionFromString("<invalid sloc>"),
 			[]Node{},
 		},
-		`0x7fd4b7063ac0 <<invalid sloc>> Implicit 8`:
+		`0x7fd4b7063ac0 <<invalid sloc>> Implicit 8`: testNode{&MaxFieldAlignmentAttr{
-		testNode{&MaxFieldAlignmentAttr{
 			Addr:       0x7fd4b7063ac0,
 			Pos:        NewPositionFromString("<invalid sloc>"),
 			Size:       8,

ast/may_alias_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestMayAliasAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&MayAliasAttr{
-		testNode{&MayAliasAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/member_expr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestMemberExpr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fcc758e34a0 <col:8, col:12> 'int' lvalue ->_w 0x7fcc758d60c8`:
+		`0x7fcc758e34a0 <col:8, col:12> 'int' lvalue ->_w 0x7fcc758d60c8`: testNode{&MemberExpr{
-		testNode{&MemberExpr{
 			Addr:       0x7fcc758e34a0,
 			Pos:        NewPositionFromString("col:8, col:12"),
 			Type:       "int",
@@ -23,8 +22,7 @@ func TestMemberExpr(t *testing.T) {
 			NewPositionFromString("col:8, col:12"),
 			[]Node{},
 		},
-		`0x7fcc76004210 <col:12, col:16> 'unsigned char *' lvalue ->_p 0x7fcc758d6018`:
+		`0x7fcc76004210 <col:12, col:16> 'unsigned char *' lvalue ->_p 0x7fcc758d6018`: testNode{&MemberExpr{
-		testNode{&MemberExpr{
 			Addr:       0x7fcc76004210,
 			Pos:        NewPositionFromString("col:12, col:16"),
 			Type:       "unsigned char *",
@@ -40,8 +38,7 @@ func TestMemberExpr(t *testing.T) {
 			NewPositionFromString("col:12, col:16"),
 			[]Node{},
 		},
-		`0x7f85338325b0 <col:4, col:13> 'float' lvalue .constant 0x7f8533832260`:
+		`0x7f85338325b0 <col:4, col:13> 'float' lvalue .constant 0x7f8533832260`: testNode{&MemberExpr{
-		testNode{&MemberExpr{
 			Addr:       0x7f85338325b0,
 			Pos:        NewPositionFromString("col:4, col:13"),
 			Type:       "float",
@@ -57,8 +54,7 @@ func TestMemberExpr(t *testing.T) {
 			NewPositionFromString("col:4, col:13"),
 			[]Node{},
 		},
-		`0x7f8533832670 <col:4, col:13> 'char *' lvalue .pointer 0x7f85338322b8`:
+		`0x7f8533832670 <col:4, col:13> 'char *' lvalue .pointer 0x7f85338322b8`: testNode{&MemberExpr{
-		testNode{&MemberExpr{
 			Addr:       0x7f8533832670,
 			Pos:        NewPositionFromString("col:4, col:13"),
 			Type:       "char *",
@@ -74,8 +70,7 @@ func TestMemberExpr(t *testing.T) {
 			NewPositionFromString("col:4, col:13"),
 			[]Node{},
 		},
-		`0x7fb7d5a49ac8 <col:3, col:6> 'bft':'unsigned int' lvalue bitfield ->isPrepareV2 0x7fb7d5967f40`:
+		`0x7fb7d5a49ac8 <col:3, col:6> 'bft':'unsigned int' lvalue bitfield ->isPrepareV2 0x7fb7d5967f40`: testNode{&MemberExpr{
-		testNode{&MemberExpr{
 			Addr:       0x7fb7d5a49ac8,
 			Pos:        NewPositionFromString("col:3, col:6"),
 			Type:       "bft",
@@ -91,8 +86,7 @@ func TestMemberExpr(t *testing.T) {
 			NewPositionFromString("col:3, col:6"),
 			[]Node{},
 		},
-		`0x2914fb8 <col:12, col:14> 'union vec3d_t::(anonymous at main.c:2:5)' lvalue . 0x2914920`:
+		`0x2914fb8 <col:12, col:14> 'union vec3d_t::(anonymous at main.c:2:5)' lvalue . 0x2914920`: testNode{&MemberExpr{
-		testNode{&MemberExpr{
 			Addr:       0x2914fb8,
 			Pos:        NewPositionFromString("col:12, col:14"),
 			Type:       "union vec3d_t::(anonymous at main.c:2:5)",
@@ -108,8 +102,7 @@ func TestMemberExpr(t *testing.T) {
 			NewPositionFromString("col:12, col:14"),
 			[]Node{},
 		},
-		`0x3180ef0 <col:32, col:48> 'int' .n 0x317f450`:
+		`0x3180ef0 <col:32, col:48> 'int' .n 0x317f450`: testNode{&MemberExpr{
-		testNode{&MemberExpr{
 			Addr:       0x3180ef0,
 			Pos:        NewPositionFromString("col:32, col:48"),
 			Type:       "int",

ast/min_vector_width_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestMinVectorWidthAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7> content`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7> content`: testNode{&MinVectorWidthAttr{
-		testNode{&MinVectorWidthAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			Content:    " content",

ast/mode_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func Test(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7f980b858309 <line:11:7, line:18:7> foo`:
+		`0x7f980b858309 <line:11:7, line:18:7> foo`: testNode{&ModeAttr{
-		testNode{&ModeAttr{
 			Addr:       0x7f980b858309,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			Name:       "foo",

ast/no_debug_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestNoDebugAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&NoDebugAttr{
-		testNode{&NoDebugAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/no_escape_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestNoEscapeAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&NoEscapeAttr{
-		testNode{&NoEscapeAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/no_inline_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestNoInlineAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc02a8a6730 <line:24619:23>`:
+		`0x7fc02a8a6730 <line:24619:23>`: testNode{&NoInlineAttr{
-		testNode{&NoInlineAttr{
 			Addr:       0x7fc02a8a6730,
 			Pos:        NewPositionFromString("line:24619:23"),
 			ChildNodes: []Node{},

ast/no_throw_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestNoThrowAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fa1488273a0 <line:7:4, line:11:4>`:
+		`0x7fa1488273a0 <line:7:4, line:11:4>`: testNode{&NoThrowAttr{
-		testNode{&NoThrowAttr{
 			Addr:       0x7fa1488273a0,
 			Pos:        NewPositionFromString("line:7:4, line:11:4"),
 			ChildNodes: []Node{},
@@ -18,8 +17,7 @@ func TestNoThrowAttr(t *testing.T) {
 			NewPositionFromString("line:7:4, line:11:4"),
 			[]Node{},
 		},
-		`0x5605ceaf4b88 <col:12> Implicit`:
+		`0x5605ceaf4b88 <col:12> Implicit`: testNode{&NoThrowAttr{
-		testNode{&NoThrowAttr{
 			Addr:       0x5605ceaf4b88,
 			Pos:        NewPositionFromString("col:12"),
 			ChildNodes: []Node{},
@@ -30,8 +28,7 @@ func TestNoThrowAttr(t *testing.T) {
 			NewPositionFromString("col:12"),
 			[]Node{},
 		},
-		`0x4153c50 </usr/include/unistd.h:779:46> Inherited`:
+		`0x4153c50 </usr/include/unistd.h:779:46> Inherited`: testNode{&NoThrowAttr{
-		testNode{&NoThrowAttr{
 			Addr:       0x4153c50,
 			Pos:        NewPositionFromString("/usr/include/unistd.h:779:46"),
 			ChildNodes: []Node{},
@@ -42,8 +39,7 @@ func TestNoThrowAttr(t *testing.T) {
 			NewPositionFromString("/usr/include/unistd.h:779:46"),
 			[]Node{},
 		},
-		`0x1038b8828 <col:20> Inherited Implicit`:
+		`0x1038b8828 <col:20> Inherited Implicit`: testNode{&NoThrowAttr{
-		testNode{&NoThrowAttr{
 			Addr:       0x1038b8828,
 			Pos:        NewPositionFromString("col:20"),
 			ChildNodes: []Node{},

ast/non_null_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestNonNullAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fa1488273b0 <line:7:4, line:11:4> 1`:
+		`0x7fa1488273b0 <line:7:4, line:11:4> 1`: testNode{&NonNullAttr{
-		testNode{&NonNullAttr{
 			Addr:       0x7fa1488273b0,
 			Pos:        NewPositionFromString("line:7:4, line:11:4"),
 			Inherited:  false,
@@ -21,8 +20,7 @@ func TestNonNullAttr(t *testing.T) {
 			NewPositionFromString("line:7:4, line:11:4"),
 			[]Node{},
 		},
-		`0x2cce280 </sys/cdefs.h:286:44, /bits/mathcalls.h:115:69> 1`:
+		`0x2cce280 </sys/cdefs.h:286:44, /bits/mathcalls.h:115:69> 1`: testNode{&NonNullAttr{
-		testNode{&NonNullAttr{
 			Addr:       0x2cce280,
 			Pos:        NewPositionFromString("/sys/cdefs.h:286:44, /bits/mathcalls.h:115:69"),
 			Inherited:  false,
@@ -36,8 +34,7 @@ func TestNonNullAttr(t *testing.T) {
 			NewPositionFromString("/sys/cdefs.h:286:44, /bits/mathcalls.h:115:69"),
 			[]Node{},
 		},
-		`0x201ede0 <line:145:79, col:93> 0`:
+		`0x201ede0 <line:145:79, col:93> 0`: testNode{&NonNullAttr{
-		testNode{&NonNullAttr{
 			Addr:       0x201ede0,
 			Pos:        NewPositionFromString("line:145:79, col:93"),
 			Inherited:  false,
@@ -51,8 +48,7 @@ func TestNonNullAttr(t *testing.T) {
 			NewPositionFromString("line:145:79, col:93"),
 			[]Node{},
 		},
-		`0x1b89b20 <col:76, col:93> 2 3`:
+		`0x1b89b20 <col:76, col:93> 2 3`: testNode{&NonNullAttr{
-		testNode{&NonNullAttr{
 			Addr:       0x1b89b20,
 			Pos:        NewPositionFromString("col:76, col:93"),
 			Inherited:  false,
@@ -66,8 +62,7 @@ func TestNonNullAttr(t *testing.T) {
 			NewPositionFromString("col:76, col:93"),
 			[]Node{},
 		},
-		`0x55f0219e20d0 <line:717:22, col:42> 0 1 4`:
+		`0x55f0219e20d0 <line:717:22, col:42> 0 1 4`: testNode{&NonNullAttr{
-		testNode{&NonNullAttr{
 			Addr:       0x55f0219e20d0,
 			Pos:        NewPositionFromString("line:717:22, col:42"),
 			Inherited:  false,
@@ -81,8 +76,7 @@ func TestNonNullAttr(t *testing.T) {
 			NewPositionFromString("line:717:22, col:42"),
 			[]Node{},
 		},
-		`0x248ea60 <line:155:26, col:49> 0 1 2 4`:
+		`0x248ea60 <line:155:26, col:49> 0 1 2 4`: testNode{&NonNullAttr{
-		testNode{&NonNullAttr{
 			Addr:       0x248ea60,
 			Pos:        NewPositionFromString("line:155:26, col:49"),
 			Inherited:  false,
@@ -96,8 +90,7 @@ func TestNonNullAttr(t *testing.T) {
 			NewPositionFromString("line:155:26, col:49"),
 			[]Node{},
 		},
-		`0x39cf2b0 <col:53> Inherited 0 1`:
+		`0x39cf2b0 <col:53> Inherited 0 1`: testNode{&NonNullAttr{
-		testNode{&NonNullAttr{
 			Addr:       0x39cf2b0,
 			Pos:        NewPositionFromString("col:53"),
 			Inherited:  true,

ast/not_tail_called_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestNotTailCalledAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc8fa094558 <col:107> `:
+		`0x7fc8fa094558 <col:107> `: testNode{&NotTailCalledAttr{
-		testNode{&NotTailCalledAttr{
 			Addr:       0x7fc8fa094558,
 			Pos:        NewPositionFromString("col:107"),
 			ChildNodes: []Node{},

ast/ns_consumed_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestNSConsumedAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7> content`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7> content`: testNode{&NSConsumedAttr{
-		testNode{&NSConsumedAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			Content:    " content",

ast/ns_consumes_self_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestNSConsumesSelfAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&NSConsumesSelfAttr{
-		testNode{&NSConsumesSelfAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/ns_error_domain_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestNSErrorDomainAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7> content`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7> content`: testNode{&NSErrorDomainAttr{
-		testNode{&NSErrorDomainAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			Content:    " content",

ast/ns_returns_retained_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestNSReturnsRetainedAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&NSReturnsRetainedAttr{
-		testNode{&NSReturnsRetainedAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/objc_bool_literal_expr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestObjCBoolLiteralExpr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fcd0f9e7fe8 <col:13> 'BOOL':'signed char' __objc_yes`:
+		`0x7fcd0f9e7fe8 <col:13> 'BOOL':'signed char' __objc_yes`: testNode{&ObjCBoolLiteralExpr{
-		testNode{&ObjCBoolLiteralExpr{
 			Addr:       0x7fcd0f9e7fe8,
 			Pos:        NewPositionFromString("col:13"),
 			Type:       "BOOL",
@@ -19,8 +18,7 @@ func TestObjCBoolLiteralExpr(t *testing.T) {
 			NewPositionFromString("col:13"),
 			[]Node{},
 		},
-		`0x7fcd0f9ed000 <col:13> 'BOOL':'signed char' __objc_no`:
+		`0x7fcd0f9ed000 <col:13> 'BOOL':'signed char' __objc_no`: testNode{&ObjCBoolLiteralExpr{
-		testNode{&ObjCBoolLiteralExpr{
 			Addr:       0x7fcd0f9ed000,
 			Pos:        NewPositionFromString("col:13"),
 			Type:       "BOOL",

ast/objc_boxable_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestObjCBoxableAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&ObjCBoxableAttr{
-		testNode{&ObjCBoxableAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/objc_bridge_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestObjCBridgeAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7> content`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7> content`: testNode{&ObjCBridgeAttr{
-		testNode{&ObjCBridgeAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			Content:    " content",

ast/objc_bridge_mutable_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestObjCBridgeMutableAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7> content`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7> content`: testNode{&ObjCBridgeMutableAttr{
-		testNode{&ObjCBridgeMutableAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			Content:    " content",

ast/objc_bridge_related_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestObjCBridgeRelatedAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7> content`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7> content`: testNode{&ObjCBridgeRelatedAttr{
-		testNode{&ObjCBridgeRelatedAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			Content:    " content",

ast/objc_category_decl.go

@@ -1,7 +1,7 @@
 package ast
 
 import (
-//	"fmt"
+	//	"fmt"
 	"strings"
 )
 

ast/objc_category_decl_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestObjCCategoryDecl(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fdef0862430 <line:120:1, col:16> col:16 NSObject`:
+		`0x7fdef0862430 <line:120:1, col:16> col:16 NSObject`: testNode{&ObjCCategoryDecl{
-		testNode{&ObjCCategoryDecl{
 			Addr:       0x7fdef0862430,
 			Pos:        NewPositionFromString("line:120:1, col:16"),
 			Position2:  "",

ast/objc_designated_initializer_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestObjCDesignatedInitializerAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&ObjCDesignatedInitializerAttr{
-		testNode{&ObjCDesignatedInitializerAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},

ast/objc_exception_attr_test.go

@@ -6,8 +6,7 @@ import (
 
 func TestObjCExceptionAttr(t *testing.T) {
 	nodes := map[string]testNode{
-		`0x7fc0a69091d1 <line:11:7, line:18:7>`:
+		`0x7fc0a69091d1 <line:11:7, line:18:7>`: testNode{&ObjCExceptionAttr{
-		testNode{&ObjCExceptionAttr{
 			Addr:       0x7fc0a69091d1,
 			Pos:        NewPositionFromString("line:11:7, line:18:7"),
 			ChildNodes: []Node{},