Add []Ast to ast.Dump

ncw · ncw · commit a112b808a5cf · 2014-11-09T23:06:03.000Z
diff --git a/ast/dump.go b/ast/dump.go
@@ -9,7 +9,7 @@ import (
 )
 
 // Dump an Ast node as a string
-func AstDump(ast Ast) string {
+func Dump(ast Ast) string {
 	if ast == nil {
 		return "<nil>"
 	}
@@ -21,7 +21,18 @@ func AstDump(ast Ast) string {
 		fieldType := astType.Field(i)
 		fieldValue := astValue.Field(i)
 		fname := fieldType.Name
-		if fieldValue.CanInterface() {
+		if fieldValue.Kind() == reflect.Slice {
+			strs := make([]string, fieldValue.Len())
+			for i := 0; i < fieldValue.Len(); i++ {
+				element := fieldValue.Index(i)
+				if element.CanInterface() {
+					if x, ok := element.Interface().(Ast); ok {
+						strs[i] = Dump(x)
+					}
+				}
+			}
+			args = append(args, fmt.Sprintf("%s=[%s]", fname, strings.Join(strs, ",")))
+		} else if fieldValue.CanInterface() {
 			v := fieldValue.Interface()
 			switch x := v.(type) {
 			case py.String:
@@ -32,7 +43,7 @@ func AstDump(ast Ast) string {
 			case SliceBase:
 			case Pos:
 			case Ast:
-				args = append(args, fmt.Sprintf("%s=%s", fname, AstDump(x)))
+				args = append(args, fmt.Sprintf("%s=%s", fname, Dump(x)))
 			default:
 				args = append(args, fmt.Sprintf("%s=%v", fname, x))
 			}
diff --git a/ast/dump_test.go b/ast/dump_test.go
@@ -17,10 +17,12 @@ func TestDump(t *testing.T) {
 		{&Str{S: py.String("potato")}, `Str(S="potato")`},
 		{&BinOp{Left: &Str{S: py.String("one")}, Op: Add, Right: &Str{S: py.String("two")}},
 			`BinOp(Left=Str(S="one"),Op=Add,Right=Str(S="two"))`},
+		{&Module{}, `Module(Body=[])`},
+		{&Module{Body: []Stmt{&Pass{}}}, `Module(Body=[Pass()])`},
 	} {
-		out := AstDump(test.in)
+		out := Dump(test.in)
 		if out != test.out {
-			t.Errorf("AstDump(%#v) got %q expected %q", test.in, out, test.out)
+			t.Errorf("Dump(%#v) got %q expected %q", test.in, out, test.out)
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,12 @@ func TestDump(t *testing.T) {`
`17`	`17`	{&Str{S: py.String("potato")}, `Str(S="potato")`},
`18`	`18`	`{&BinOp{Left: &Str{S: py.String("one")}, Op: Add, Right: &Str{S: py.String("two")}},`
`19`	`19`	`BinOp(Left=Str(S="one"),Op=Add,Right=Str(S="two"))`},
	`20`	+ {&Module{}, `Module(Body=[])`},
	`21`	+ {&Module{Body: []Stmt{&Pass{}}}, `Module(Body=[Pass()])`},
`20`	`22`	`} {`
`21`		`- out := AstDump(test.in)`
	`23`	`+ out := Dump(test.in)`
`22`	`24`	`if out != test.out {`
`23`		`- t.Errorf("AstDump(%#v) got %q expected %q", test.in, out, test.out)`
	`25`	`+ t.Errorf("Dump(%#v) got %q expected %q", test.in, out, test.out)`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`	`}`