Merge pull request #110 from xushiwei/q

README.md
goplus · Mar 12, 2024 · e36cd2f · e36cd2f
2 parents a58ab64 + 36cea50
commit e36cd2f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -121,7 +121,7 @@ run ":8080"
 
 ### yaptest: HTTP Test Framework
 
-yaptest is a web server testing framework. This classfile has the file suffix `_ytest.gox`.
+[yaptest](ytest) is a web server testing framework. This classfile has the file suffix `_ytest.gox`.
 
 Suppose we have a web server ([foo/get_p_#id.yap](ytest/demo/foo/get_p_%23id.yap)):
 

diff --git a/internal/htmltempl/template.go b/internal/htmltempl/template.go
@@ -56,6 +56,12 @@ func parseFS(fsys fs.FS, delimLeft, delimRight, suffix string) (*template.Templa
 	if len(filenames) == 0 {
 		return nil, fmt.Errorf("template: pattern matches no files: %#q", pattern)
 	}
+	if delimLeft == "" {
+		delimLeft = "{{"
+	}
+	if delimRight == "" {
+		delimRight = "}}"
+	}
 	t := template.New("").Delims(delimLeft, delimRight)
 	return parseFiles(t, readFileFS(fsys, delimLeft, delimRight, suffix), filenames...)
 }

diff --git a/internal/templ/template.go b/internal/templ/template.go
@@ -37,12 +37,6 @@ type iBuilder interface {
 func TranslateEx[Builder iBuilder](b Builder, text, delimLeft, delimRight string) bool {
 	offs := make([]int, 0, 16)
 	base := 0
-	if delimLeft == "" {
-		delimLeft = "{{"
-	}
-	if delimRight == "" {
-		delimRight = "}}"
-	}
 	for {
 		pos := strings.Index(text[base:], delimLeft)
 		if pos < 0 {

diff --git a/internal/templ/template_test.go b/internal/templ/template_test.go
@@ -99,7 +99,7 @@ efg
 		t.Fatal("translate(noScriptEnd):", ret)
 	}
 	var b bytes.Buffer
-	TranslateEx(&b, yapScriptIn, "", "")
+	TranslateEx(&b, yapScriptIn, "{{", "}}")
 	if b.String() != yapScriptOut {
 		t.Fatal("TranslateEx:", b.String())
 	}