Merge pull request #100 from xushiwei/q

yap: param("name") => ${name}
goplus · Mar 9, 2024 · 4363f2b · 4363f2b
2 parents 637f80f + 56bb489
commit 4363f2b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ Let's create a file named [get_p_#id.yap](demo/classfile2_hello/get_p_%23id.yap)
 
 ```coffee
 json {
-	"id": param("id"),
+	"id": ${id},
 }
 ```
 
@@ -80,15 +80,15 @@ Execute `gop run .` and visit http://localhost:8080/p/123, you will get:
 
 #### YAP Template
 
-In most cases, we will not use the `html` directive to return a html page, but use the `yap` template engine. See [get_p_#id.yap](demo/classfile2_blog/get_p_%23id.yap):
+In most cases, we don't use the `html` directive to generate html pages, but use the `yap` template engine. See [get_p_#id.yap](demo/classfile2_blog/get_p_%23id.yap):
 
 ```coffee
 yap "article", {
-	"id": param("id"),
+	"id": ${id},
 }
 ```
 
-It means we need to find a template called `article` to render. See [yap/article_yap.html](demo/classfile2_blog/yap/article_yap.html):
+It means finding a template called `article` to render. See [yap/article_yap.html](demo/classfile2_blog/yap/article_yap.html):
 
 ```html
 <html>

diff --git a/demo/classfile2_blog/get_p_#id.yap b/demo/classfile2_blog/get_p_#id.yap
@@ -1,3 +1,3 @@
 yap "article", {
-	"id": param("id"),
+	"id": ${id},
 }
diff --git a/demo/classfile2_blog/gop_autogen.go b/demo/classfile2_blog/gop_autogen.go
diff --git a/demo/classfile2_hello/get_p_#id.yap b/demo/classfile2_hello/get_p_#id.yap
@@ -1,3 +1,3 @@
 json {
-	"id": param("id"),
+	"id": ${id},
 }
diff --git a/demo/classfile2_hello/gop_autogen.go b/demo/classfile2_hello/gop_autogen.go
diff --git a/demo/classfile_blog/blog_yap.gox b/demo/classfile_blog/blog_yap.gox
@@ -1,10 +1,10 @@
+get "/", ctx => {
+	ctx.html `<html><body>Hello, <a href="/p/123">YAP</a>!</body></html>`
+}
 get "/p/:id", ctx => {
 	ctx.yap "article", {
 		"id": ctx.param("id"),
 	}
 }
-get "/", ctx => {
-	ctx.html `<html><body>Hello, <a href="/p/123">YAP</a>!</body></html>`
-}
 
 run ":8888"
diff --git a/demo/classfile_blog/gop_autogen.go b/demo/classfile_blog/gop_autogen.go