vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

parser: minor cleanup in comp_call() (#11311)

pull/11319/head
yuyi 2021-08-26 12:57:10 +08:00 committed by GitHub
parent b635ff80de
commit 187c1c160b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,43 +47,43 @@ fn (mut p Parser) comp_call() ast.ComptimeCall {
start_pos := p.prev_tok.position() start_pos := p.prev_tok.position()
error_msg := 'only `\$tmpl()`, `\$env()`, `\$embed_file()`, `\$pkgconfig()` and `\$vweb.html()` comptime functions are supported right now' error_msg := 'only `\$tmpl()`, `\$env()`, `\$embed_file()`, `\$pkgconfig()` and `\$vweb.html()` comptime functions are supported right now'
if p.peek_tok.kind == .dot { if p.peek_tok.kind == .dot {
n := p.check_name() // skip `vweb.html()` TODO name := p.check_name() // skip `vweb.html()` TODO
if n != 'vweb' { if name != 'vweb' {
p.error(error_msg) p.error(error_msg)
return err_node return err_node
} }
p.check(.dot) p.check(.dot)
} }
n := p.check_name() // (.name) method_name := p.check_name() // (.name)
if n !in parser.supported_comptime_calls { if method_name !in parser.supported_comptime_calls {
p.error(error_msg) p.error(error_msg)
return err_node return err_node
} }
is_embed_file := n == 'embed_file' is_embed_file := method_name == 'embed_file'
is_html := n == 'html' is_html := method_name == 'html'
// $env('ENV_VAR_NAME') // $env('ENV_VAR_NAME')
p.check(.lpar) p.check(.lpar)
spos := p.tok.position() spos := p.tok.position()
if n == 'env' { if method_name == 'env' {
s := p.tok.lit s := p.tok.lit
p.check(.string) p.check(.string)
p.check(.rpar) p.check(.rpar)
return ast.ComptimeCall{ return ast.ComptimeCall{
scope: 0 scope: 0
method_name: n method_name: method_name
args_var: s args_var: s
is_env: true is_env: true
env_pos: spos env_pos: spos
pos: spos.extend(p.prev_tok.position()) pos: spos.extend(p.prev_tok.position())
} }
} }
if n == 'pkgconfig' { if method_name == 'pkgconfig' {
s := p.tok.lit s := p.tok.lit
p.check(.string) p.check(.string)
p.check(.rpar) p.check(.rpar)
return ast.ComptimeCall{ return ast.ComptimeCall{
scope: 0 scope: 0
method_name: n method_name: method_name
args_var: s args_var: s
is_pkgconfig: true is_pkgconfig: true
env_pos: spos env_pos: spos
@ -161,7 +161,7 @@ fn (mut p Parser) comp_call() ast.ComptimeCall {
return ast.ComptimeCall{ return ast.ComptimeCall{
scope: 0 scope: 0
is_vweb: true is_vweb: true
method_name: n method_name: method_name
args_var: literal_string_param args_var: literal_string_param
pos: start_pos.extend(p.prev_tok.position()) pos: start_pos.extend(p.prev_tok.position())
} }
@ -226,7 +226,7 @@ fn (mut p Parser) comp_call() ast.ComptimeCall {
scope: 0 scope: 0
is_vweb: true is_vweb: true
vweb_tmpl: file vweb_tmpl: file
method_name: n method_name: method_name
args_var: literal_string_param args_var: literal_string_param
pos: start_pos.extend(p.prev_tok.position()) pos: start_pos.extend(p.prev_tok.position())
} }