Merge pull request #1832 from visualfc/cl_error

cl: compileExpr/compileExprLHS panic code error
goplus · Apr 1, 2024 · 9875bae · 9875bae
2 parents 326b271 + d1e3230
commit 9875bae
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/cl/builtin_test.go b/cl/builtin_test.go
@@ -92,11 +92,14 @@ func TestCompileLambda2(t *testing.T) {
 
 func TestCompileExpr(t *testing.T) {
 	defer func() {
-		if e := recover(); e != "compileExpr failed: unknown - *ast.Ellipsis\n" {
-			t.Fatal("compileExpr:", e)
+		if e := recover(); e != nil {
+			if ce := e.(*gogen.CodeError); ce.Msg != "compileExpr failed: unknown - *ast.Ellipsis" {
+				t.Fatal("compileExpr:", ce.Msg)
+			}
 		}
 	}()
-	compileExpr(nil, &ast.Ellipsis{})
+	ctx := &blockCtx{pkgCtx: &pkgCtx{}}
+	compileExpr(ctx, &ast.Ellipsis{})
 }
 
 func TestCompileStmt(t *testing.T) {

diff --git a/cl/error_msg_test.go b/cl/error_msg_test.go
@@ -1049,3 +1049,17 @@ type
 a := 1
 `)
 }
+
+func TestCompileExprError(t *testing.T) {
+	codeErrorTestAst(t, "main", "bar.go", `bar.go:5:1: compileExpr failed: unknown - *ast.BadExpr`, `
+func Foo(){}
+func _() {
+	Foo(
+}
+`)
+	codeErrorTestAst(t, "main", "bar.go", `bar.go:3:2: compileExprLHS failed: unknown - *ast.StructType`, `
+func _() {
+	struct() = nil
+}
+`)
+}
diff --git a/cl/expr.go b/cl/expr.go
@@ -24,7 +24,6 @@ import (
 	"go/types"
 	"log"
 	"math/big"
-	"reflect"
 	"strconv"
 	"strings"
 	"syscall"
@@ -249,7 +248,7 @@ func compileExprLHS(ctx *blockCtx, expr ast.Expr) {
 	case *ast.StarExpr:
 		compileStarExprLHS(ctx, v)
 	default:
-		log.Panicln("compileExpr failed: unknown -", reflect.TypeOf(v))
+		panic(ctx.newCodeErrorf(v.Pos(), "compileExprLHS failed: unknown - %T", expr))
 	}
 	if rec := ctx.recorder(); rec != nil {
 		rec.recordExpr(ctx, expr, true)
@@ -365,7 +364,7 @@ func compileExpr(ctx *blockCtx, expr ast.Expr, inFlags ...int) {
 	case *ast.EnvExpr:
 		compileEnvExpr(ctx, v)
 	default:
-		log.Panicf("compileExpr failed: unknown - %T\n", v)
+		panic(ctx.newCodeErrorf(v.Pos(), "compileExpr failed: unknown - %T", v))
 	}
 	if rec := ctx.recorder(); rec != nil {
 		rec.recordExpr(ctx, expr, false)