compiler: symtable - stringer and fix test

ncw · ncw · commit 39eaafff7d24 · 2015-04-17T11:12:10.000+01:00
diff --git a/compile/symtable.go b/compile/symtable.go
@@ -7,12 +7,14 @@ import (
 	"github.com/ncw/gpython/py"
 )
 
+//go:generate stringer -type=Scope,BlockType -output stringer.go
+
 // Scope
 type Scope uint8
 
 // Scope definitions
 const (
-	scopeInvalid = Scope(iota)
+	scopeInvalid Scope = iota
 	scopeLocal
 	scopeGlobalExplicit
 	scopeGlobalImplicit
@@ -25,14 +27,14 @@ type DefUse uint8
 
 // Flags for def-use information
 const (
-	defGlobal    = DefUse(1 << iota) // global stmt
-	defLocal                         // assignment in code block
-	defParam                         // formal parameter
-	defNonlocal                      // nonlocal stmt
-	defUse                           // name is used
-	defFree                          // name used but not defined in nested block
-	defFreeClass                     // free variable from class's method
-	defImport                        // assignment occurred via import
+	defGlobal    DefUse = 1 << iota // global stmt
+	defLocal                        // assignment in code block
+	defParam                        // formal parameter
+	defNonlocal                     // nonlocal stmt
+	defUse                          // name is used
+	defFree                         // name used but not defined in nested block
+	defFreeClass                    // free variable from class's method
+	defImport                       // assignment occurred via import
 
 	defBound = (defLocal | defParam | defImport)
 
@@ -47,7 +49,7 @@ type BlockType uint8
 
 // BlockTypes
 const (
-	FunctionBlock = BlockType(iota)
+	FunctionBlock BlockType = iota
 	ClassBlock
 	ModuleBlock
 )
@@ -79,9 +81,16 @@ type SymTable struct {
 	Varnames   []string // list of function parameters
 }
 
-// Make a new symbol table from the ast supplied
-func NewSymTable(Ast ast.Ast, parent *SymTable) *SymTable {
+// Make a new top symbol table from the ast supplied
+func NewSymTable(Ast ast.Ast) *SymTable {
+	return newSymTable(Ast, ModuleBlock, "top", nil)
+}
+
+// Make a new symbol table from the ast supplied of the given type
+func newSymTable(Ast ast.Ast, Type BlockType, Name string, parent *SymTable) *SymTable {
 	st := &SymTable{
+		Type:    ModuleBlock,
+		Name:    "top",
 		Parent:  parent,
 		Symbols: NewSymbols(),
 	}
diff --git a/compile/symtable_test.go b/compile/symtable_test.go
@@ -11,19 +11,31 @@ import (
 
 func EqInt(t *testing.T, name string, a, b int) {
 	if a != b {
-		t.Errorf("%s want %d, got %d", name, a, b)
+		t.Errorf("%s want %v, got %v", name, a, b)
+	}
+}
+
+func EqScope(t *testing.T, name string, a, b Scope) {
+	if a != b {
+		t.Errorf("%s want %v, got %v", name, a, b)
+	}
+}
+
+func EqBlockType(t *testing.T, name string, a, b BlockType) {
+	if a != b {
+		t.Errorf("%s want %v, got %v", name, a, b)
 	}
 }
 
 func EqBool(t *testing.T, name string, a, b bool) {
 	if a != b {
-		t.Errorf("%s want %d, got %d", name, a, b)
+		t.Errorf("%s want %v, got %v", name, a, b)
 	}
 }
 
 func EqSymbol(t *testing.T, name string, a, b Symbol) {
 	EqString(t, name+".Name", a.Name, b.Name)
-	EqInt(t, name+".Scope", int(a.Scope), int(b.Scope))
+	EqScope(t, name+".Scope", a.Scope, b.Scope)
 	EqInt(t, name+".Flags", int(a.Flags), int(b.Flags))
 	if a.Namespace == nil {
 		if b.Namespace == nil {
@@ -61,7 +73,7 @@ func EqSymbols(t *testing.T, name string, a, b Symbols) {
 }
 
 func EqSymTable(t *testing.T, name string, a, b *SymTable) {
-	EqInt(t, name+": Type", int(a.Type), int(b.Type))
+	EqBlockType(t, name+": Type", a.Type, b.Type)
 	EqString(t, name+": Name", a.Name, b.Name)
 	EqInt(t, name+": Lineno", a.Lineno, b.Lineno)
 	EqBool(t, name+": Optimized", a.Optimized, b.Optimized)
@@ -109,7 +121,7 @@ func TestSymTable(t *testing.T) {
 			if err != nil {
 				panic(err) // FIXME error handling!
 			}
-			symtab = NewSymTable(Ast, nil)
+			symtab = NewSymTable(Ast)
 		}()
 		if test.out == nil {
 			if symtab != nil {
