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

jsgen: fix JS.@typeof (#7055)

pull/7059/head
Leah Lundqvist 2020-12-01 04:02:10 +01:00 committed by GitHub
parent 552de94da6
commit ab225ff154
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vlib/v/gen/js/js.v
View File

@ -411,12 +411,20 @@ fn (mut g JsGen) get_alias(name string) string {
} }
fn (mut g JsGen) js_name(name_ string) string { fn (mut g JsGen) js_name(name_ string) string {
ns := get_ns(name_) mut is_js := false
mut name := if ns == g.namespace { name_.split('.').last() } else { g.get_alias(name_) } mut name := name_
if name.starts_with('JS.') {
name = name[3..]
is_js = true
}
ns := get_ns(name)
name = if ns == g.namespace { name.split('.').last() } else { g.get_alias(name) }
mut parts := name.split('.') mut parts := name.split('.')
for i, p in parts { if !is_js {
if p in js_reserved { for i, p in parts {
parts[i] = 'v_$p' if p in js_reserved {
parts[i] = 'v_$p'
}
} }
} }
return parts.join('.') return parts.join('.')
@ -1168,12 +1176,7 @@ fn (mut g JsGen) gen_array_init_values(exprs []ast.Expr) {
} }
fn (mut g JsGen) gen_call_expr(it ast.CallExpr) { fn (mut g JsGen) gen_call_expr(it ast.CallExpr) {
mut name := '' mut name := g.js_name(it.name)
if it.name.starts_with('JS.') {
name = it.name[3..]
} else {
name = g.js_name(it.name)
}
call_return_is_optional := it.return_type.has_flag(.optional) call_return_is_optional := it.return_type.has_flag(.optional)
if call_return_is_optional { if call_return_is_optional {
g.writeln('(function(){') g.writeln('(function(){')
@ -1224,7 +1227,7 @@ fn (mut g JsGen) gen_call_expr(it ast.CallExpr) {
g.write('builtin.') g.write('builtin.')
} }
} }
g.write('${g.js_name(name)}(') g.write('${name}(')
for i, arg in it.args { for i, arg in it.args {
g.expr(arg.expr) g.expr(arg.expr)
if i != it.args.len - 1 { if i != it.args.len - 1 {