Catch panics from vm

Author: ncw

main.go

@@ -62,6 +62,9 @@ func main(){
  }
 code:=obj.(*py.Code)
 v:=vm.NewVm()
-v.Run(code)
+err=v.Run(code)
+iferr!=nil{
+log.Fatal(err)
+ }
 
 }

vm/eval.go

@@ -2,6 +2,7 @@
 package vm
 
 import (
+"errors"
 "fmt"
 "github.com/ncw/gpython/py"
 )
@@ -777,7 +778,21 @@ func do_CALL_FUNCTION_VAR_KW(vm *Vm, argc int32){
 }
 
 // Run the virtual machine on the code object
-func (vm*Vm) Run(co*py.Code){
+//
+// FIXME figure out how we are going to signal exceptions!
+func (vm*Vm) Run(co*py.Code) (errerror){
+deferfunc(){
+ifr:=recover(); r!=nil{
+switchx:=r.(type){
+caseerror:
+err=x
+casestring:
+err=errors.New(x)
+default:
+err=errors.New(fmt.Sprintf("Unknown error '%s'", x))
+ }
+ }
+ }()
 vm.co=co
 ip:=0
 varopcodebyte
@@ -801,5 +816,5 @@ func (vm *Vm) Run(co *py.Code){
 vm.extended=false
 jumpTable[opcode](vm, arg)
  }
-// Return something?
+returnnil
 }