mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

parser, fmt: fix fmt error in $tmpl(path) (#16949)

Browse Source
This commit is contained in:
yuyi 2023-01-12 13:03:38 +08:00 committed by GitHub
parent 49a434e11f
commit 329b9f1a6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/v/fmt/fmt.v
View File

@ -1880,7 +1880,7 @@ pub fn (mut f Fmt) comptime_call(node ast.ComptimeCall) {
if node.method_name == 'html' { if node.method_name == 'html' {
f.write('\$vweb.html()') f.write('\$vweb.html()')
} else { } else {
f.write("\$tmpl('${node.args_var}')") f.write('\$tmpl(${node.args[0].expr})')
} }
} else { } else {
if node.is_embed { if node.is_embed {

4
vlib/v/parser/comptime.v
View File

@ -133,7 +133,7 @@ fn (mut p Parser) comptime_call() ast.ComptimeCall {
if var.expr is ast.StringLiteral { if var.expr is ast.StringLiteral {
literal_string_param = var.expr.val literal_string_param = var.expr.val
} }
} else if var := p.scope.find_const(p.mod + '.' + p.tok.lit) { } else if var := p.table.global_scope.find_const(p.mod + '.' + p.tok.lit) {
if var.expr is ast.StringLiteral { if var.expr is ast.StringLiteral {
literal_string_param = var.expr.val literal_string_param = var.expr.val
} }
@ -203,6 +203,7 @@ fn (mut p Parser) comptime_call() ast.ComptimeCall {
is_vweb: true is_vweb: true
method_name: method_name method_name: method_name
args_var: literal_string_param args_var: literal_string_param
args: [arg]
pos: start_pos.extend(p.prev_tok.pos()) pos: start_pos.extend(p.prev_tok.pos())
} }
} }
@ -244,6 +245,7 @@ fn (mut p Parser) comptime_call() ast.ComptimeCall {
vweb_tmpl: file vweb_tmpl: file
method_name: method_name method_name: method_name
args_var: literal_string_param args_var: literal_string_param
args: [arg]
pos: start_pos.extend(p.prev_tok.pos()) pos: start_pos.extend(p.prev_tok.pos())
} }
} }

4
vlib/v/tests/tmpl_using_variable_or_const_path_test.v
View File

@ -11,11 +11,11 @@ fn (s SomeThing) someval(what string) string {
fn (s SomeThing) template_variable() string { fn (s SomeThing) template_variable() string {
path := 'tmpl/template.in' path := 'tmpl/template.in'
return $tmpl('tmpl/template.in') return $tmpl(path)
} }
fn (s SomeThing) template_const() string { fn (s SomeThing) template_const() string {
return $tmpl('tmpl/template.in') return $tmpl(template_path)
} }
fn test_tmpl_with_variable_path() { fn test_tmpl_with_variable_path() {