Merge pull request #2145 from xushiwei/q

#2143 gop/cl: compileDomainTextLit

Author: xushiwei

cl/_testgop/domaintext/in.gop

@@ -0,0 +1,3 @@
+cl, err := tpl`expr = INT % ("+" | "-")`
+cl.parseExpr "1+2", nil
+_ = err

cl/_testgop/domaintext/out.go

@@ -0,0 +1,9 @@
+package main
+
+import "github.com/goplus/gop/tpl"
+
+func main() {
+	cl, err := tpl.New(`expr = INT % ("+" | "-")`)
+	cl.ParseExpr("1+2", nil)
+	_ = err
+}

cl/expr.go

@@ -387,6 +387,8 @@ func compileExpr(ctx *blockCtx, expr ast.Expr, inFlags ...int) {
 		compileEnvExpr(ctx, v)
 	/* case *ast.MatrixLit:
 	compileMatrixLit(ctx, v) */
+	case *ast.DomainTextLit:
+		compileDomainTextLit(ctx, v)
 	default:
 		panic(ctx.newCodeErrorf(v.Pos(), "compileExpr failed: unknown - %T", v))
 	}
@@ -1071,6 +1073,19 @@ func compileStringLitEx(ctx *blockCtx, cb *gogen.CodeBuilder, lit *ast.BasicLit)
 	}
 }
 
+const (
+	tplPkgPath = "github.com/goplus/gop/tpl"
+)
+
+func compileDomainTextLit(ctx *blockCtx, v *ast.DomainTextLit) {
+	switch v.Domain.Name {
+	case "tpl": // tpl`...` => tpl.new(`...`)
+		ctx.cb.Val(ctx.pkg.Import(tplPkgPath).Ref("New")).
+			Val(&goast.BasicLit{Kind: gotoken.STRING, Value: v.Value}, v).
+			Call(1)
+	}
+}
+
 const (
 	compositeLitVal    = 0
 	compositeLitKeyVal = 1

demo/gop-parser/gopcalc-2/calc.gop

@@ -3,16 +3,6 @@ import (
 	"os"
 )
 
-const tplCalc = `
-expr = termExpr % ("+" | "-")
-
-termExpr = unaryExpr % ("*" | "/")
-
-unaryExpr = operand | "-" unaryExpr
-
-operand = INT | FLOAT | "(" expr ")"
-`
-
 func calc(e any) float64 {
 	switch e := e.(type) {
 	case *tpl.Token:
@@ -41,7 +31,16 @@ func calc(e any) float64 {
 	panic("unknown expression")
 }
 
-cl := tpl.new(tplCalc)!
+cl := tpl`
+expr = termExpr % ("+" | "-")
+
+termExpr = unaryExpr % ("*" | "/")
+
+unaryExpr = operand | "-" unaryExpr
+
+operand = INT | FLOAT | "(" expr ")"
+`!
+
 print "> "
 for line <- os.Stdin {
 	e, err := cl.parseExpr(line, nil)