recover panic

mattn · Sep 25, 2013 · 71f6554 · 71f6554
1 parent 2e623cc
commit 71f6554
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/gopl/gopl.go b/gopl/gopl.go
@@ -13,23 +13,28 @@ func main() {
 	var fset = token.NewFileSet()
 	r := bufio.NewReader(os.Stdin)
 	for {
-		print("# ")
-		line, err := r.ReadString('\n')
-		if err != nil {
-			break
-		}
-		code, err := world.Compile(fset, line+";")
-		if err != nil {
-			fmt.Fprintln(os.Stderr, err)
-			continue
-		}
-		ret, err := code.Run()
-		if err != nil {
-			fmt.Fprintln(os.Stderr, err)
-			continue
-		}
-		if ret != nil {
-			println(ret.String())
-		}
+		func() {
+			defer func() {
+				recover()
+			}()
+			fmt.Print("# ")
+			line, err := r.ReadString('\n')
+			if err != nil {
+				return
+			}
+			code, err := world.Compile(fset, line + "\n")
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err)
+				return
+			}
+			ret, err := code.Run()
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err)
+				return
+			}
+			if ret != nil {
+				fmt.Println(ret.String())
+			}
+		}()
 	}
 }