symtable: correct package name and stop panic's escaping the package

ncw · ncw · commit 7a5b132bcb08 · 2015-04-24T23:21:15.000+01:00
diff --git a/symtable/make_symtable_test.py b/symtable/make_symtable_test.py
@@ -292,7 +292,7 @@ def main():
     path = "symtable_data_test.go"
     out = ["""// Test data generated by make_symtable_test.py - do not edit
 
-package compile
+package symtable
 
 import (
 "github.com/ncw/gpython/py"
diff --git a/symtable/stringer.go b/symtable/stringer.go
@@ -1,6 +1,6 @@
 // generated by stringer -type=Scope,BlockType -output stringer.go; DO NOT EDIT
 
-package compile
+package symtable
 
 import "fmt"
 
diff --git a/symtable/symtable.go b/symtable/symtable.go
@@ -7,7 +7,7 @@
 // 	st.ste_opt_lineno,
 // 	st.ste_opt_col_offset)
 
-package compile
+package symtable
 
 import (
 	"fmt"
@@ -117,14 +117,19 @@ type SymTable struct {
 }
 
 // Make a new top symbol table from the ast supplied
-func NewSymTable(Ast ast.Ast) *SymTable {
-	st := newSymTable(ModuleBlock, "top", nil)
+func NewSymTable(Ast ast.Ast) (st *SymTable, err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			err = py.MakeException(r)
+		}
+	}()
+	st = newSymTable(ModuleBlock, "top", nil)
 	st.Unoptimized = optTopLevel
 	// Parse into the symbol table
 	st.Parse(Ast)
 	// Analyze the symbolt table
 	st.Analyze()
-	return st
+	return st, nil
 }
 
 // Make a new symbol table from the ast supplied of the given type
diff --git a/symtable/symtable_data_test.go b/symtable/symtable_data_test.go
@@ -1,6 +1,6 @@
 // Test data generated by make_symtable_test.py - do not edit
 
-package compile
+package symtable
 
 import (
 	"github.com/ncw/gpython/py"
diff --git a/symtable/symtable_test.go b/symtable/symtable_test.go
@@ -1,4 +1,4 @@
-package compile
+package symtable
 
 //go:generate ./make_symtable_test.py
 
@@ -131,45 +131,34 @@ func EqSymTable(t *testing.T, name string, a, b *SymTable) {
 func TestSymTable(t *testing.T) {
 	for _, test := range symtableTestData {
 		var symtab *SymTable
-		func() {
-			defer func() {
-				if r := recover(); r != nil {
-					if test.exceptionType == nil {
-						t.Errorf("%s: Got exception %v when not expecting one", test.in, r)
-						return
-					}
-					exc, ok := r.(*py.Exception)
-					if !ok {
-						t.Errorf("%s: Got non python exception %T %v", test.in, r, r)
-						return
-					}
-					if exc.Type() != test.exceptionType {
-						t.Errorf("%s: want exception type %v got %v", test.in, test.exceptionType, exc.Type())
-						return
-					}
-					if exc.Type() != test.exceptionType {
-						t.Errorf("%s: want exception type %v got %v", test.in, test.exceptionType, exc.Type())
-						return
-					}
-					msg := string(exc.Args.(py.Tuple)[0].(py.String))
-					if msg != test.errString {
-						t.Errorf("%s: want exception text %q got %q", test.in, test.errString, msg)
-					}
-
+		Ast, err := parser.ParseString(test.in, test.mode)
+		if err != nil {
+			t.Fatalf("Unexpected parse error: %v", err)
+		}
+		symtab, err = NewSymTable(Ast)
+		if err != nil {
+			if test.exceptionType == nil {
+				t.Errorf("%s: Got exception %v when not expecting one", test.in, err)
+			} else if exc, ok := err.(*py.Exception); !ok {
+				t.Errorf("%s: Got non python exception %T %v", test.in, err, err)
+			} else if exc.Type() != test.exceptionType {
+				t.Errorf("%s: want exception type %v got %v", test.in, test.exceptionType, exc.Type())
+			} else if exc.Type() != test.exceptionType {
+				t.Errorf("%s: want exception type %v got %v", test.in, test.exceptionType, exc.Type())
+			} else {
+				msg := string(exc.Args.(py.Tuple)[0].(py.String))
+				if msg != test.errString {
+					t.Errorf("%s: want exception text %q got %q", test.in, test.errString, msg)
 				}
-			}()
-			Ast, err := parser.ParseString(test.in, test.mode)
-			if err != nil {
-				panic(err) // FIXME error handling!
-			}
-			symtab = NewSymTable(Ast)
-		}()
-		if test.out == nil {
-			if symtab != nil {
-				t.Errorf("%s: Expecting nil *py.Code but got %T", test.in, symtab)
 			}
 		} else {
-			EqSymTable(t, test.in, test.out, symtab)
+			if test.exceptionType != nil {
+				t.Errorf("%s: Didn't get exception %v", test.in, err)
+			} else if test.out == nil && symtab != nil {
+				t.Errorf("%s: Expecting nil *SymbolTab but got %T", test.in, symtab)
+			} else {
+				EqSymTable(t, test.in, test.out, symtab)
+			}
 		}
 	}
 }
