Fix errors spotted by go vet

ncw · ncw · commit 7bea4c3453e0 · 2015-06-05T10:42:43.000+01:00
diff --git a/compile/compile.go b/compile/compile.go
@@ -413,7 +413,7 @@ func (c *compiler) getRefType(name string) symtable.Scope {
 	}
 	scope := c.SymTable.GetScope(name)
 	if scope == symtable.ScopeInvalid {
-		panic(fmt.Sprintf("compile: getRefType: unknown scope for %s in %s\nsymbols: %s\nlocals: %s\nglobals: %s", name, c.Code.Name, c.SymTable.Symbols, c.Code.Varnames, c.Code.Names))
+		panic(fmt.Sprintf("compile: getRefType: unknown scope for %s in %s\nsymbols: %v\nlocals: %s\nglobals: %s", name, c.Code.Name, c.SymTable.Symbols, c.Code.Varnames, c.Code.Names))
 	}
 	return scope
 }
diff --git a/main.go b/main.go
@@ -78,18 +78,18 @@ func main() {
 	// FIXME should be using ImportModuleLevelObject() here
 	f, err := os.Open(prog)
 	if err != nil {
-		log.Fatal("Failed to open %q: %v", prog, err)
+		log.Fatalf("Failed to open %q: %v", prog, err)
 	}
 	var obj py.Object
 	if strings.HasSuffix(prog, ".pyc") {
 		obj, err = marshal.ReadPyc(f)
 		if err != nil {
-			log.Fatal("Failed to marshal %q: %v", prog, err)
+			log.Fatalf("Failed to marshal %q: %v", prog, err)
 		}
 	} else if strings.HasSuffix(prog, ".py") {
 		str, err := ioutil.ReadAll(f)
 		if err != nil {
-			log.Fatal("Failed to read %q: %v", prog, err)
+			log.Fatalf("Failed to read %q: %v", prog, err)
 		}
 		obj, err = compile.Compile(string(str), prog, "exec", 0, true)
 		if err != nil {
diff --git a/marshal/marshal.go b/marshal/marshal.go
@@ -325,7 +325,7 @@ func (rfile *rFile) ReadObject() (obj py.Object, err error) {
 			fmt.Printf("Returning None as %d/%d out of range\n", n, len(rfile.refs))
 			return py.None, nil
 
-			return nil, fmt.Errorf("TYPE_REF (out of range) - %d vs %d: %#v", n, len(rfile.refs), rfile.refs)
+			// return nil, fmt.Errorf("TYPE_REF (out of range) - %d vs %d: %#v", n, len(rfile.refs), rfile.refs)
 		}
 		AddRef = false
 		return rfile.refs[n], nil
diff --git a/notes.txt b/notes.txt
@@ -7,6 +7,13 @@ Code Quality
 Limitations
 ===========
   * string keys only in dictionaries
+    * intermediate fix - stop it panicing!
+  * line numbers missing in SyntaxErrors
+  * \N{...} escapes not implemented
+  * Interactive interpreter does single lines only
+  * compile(..., "single") not working
+  * string[x] wrong for unicode strings (easy fix)
+  * lots of builtins still to implement
 
 Todo
 ====
diff --git a/parser/grammar.y b/parser/grammar.y
diff --git a/parser/y.go b/parser/y.go

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ func (c *compiler) getRefType(name string) symtable.Scope {`
`413`	`413`	`}`
`414`	`414`	`scope := c.SymTable.GetScope(name)`
`415`	`415`	`if scope == symtable.ScopeInvalid {`
`416`		`- panic(fmt.Sprintf("compile: getRefType: unknown scope for %s in %s\nsymbols: %s\nlocals: %s\nglobals: %s", name, c.Code.Name, c.SymTable.Symbols, c.Code.Varnames, c.Code.Names))`
	`416`	`+ panic(fmt.Sprintf("compile: getRefType: unknown scope for %s in %s\nsymbols: %v\nlocals: %s\nglobals: %s", name, c.Code.Name, c.SymTable.Symbols, c.Code.Varnames, c.Code.Names))`
`417`	`417`	`}`
`418`	`418`	`return scope`
`419`	`419`	`}`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ func (rfile *rFile) ReadObject() (obj py.Object, err error) {`
`325`	`325`	`fmt.Printf("Returning None as %d/%d out of range\n", n, len(rfile.refs))`
`326`	`326`	`return py.None, nil`
`327`	`327`
`328`		`- return nil, fmt.Errorf("TYPE_REF (out of range) - %d vs %d: %#v", n, len(rfile.refs), rfile.refs)`
	`328`	`+ // return nil, fmt.Errorf("TYPE_REF (out of range) - %d vs %d: %#v", n, len(rfile.refs), rfile.refs)`
`329`	`329`	`}`
`330`	`330`	`AddRef = false`
`331`	`331`	`return rfile.refs[n], nil`