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

'$foo()' string interpolation

Browse Source
This commit is contained in:
Alexander Medvednikov
2019-12-08 22:22:47 +03:00
parent ef821379da
commit 8f9b6ac248
11 changed files with 57 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vlib/compiler/scanner.v
View File

@@ -299,7 +299,8 @@ fn (s mut Scanner) scan() ScanRes {
}
}
// end of `$expr`
if s.inter_start && next_char != `.` {
// allow `'$a.b'` and `'$a.c()'`
if s.inter_start && next_char != `.` && next_char != `(` {
s.inter_end = true
s.inter_start = false
}
@@ -315,6 +316,16 @@ fn (s mut Scanner) scan() ScanRes {
num := s.ident_number()
return scan_res(.number, num)
}
// Handle `'$fn()'`
if c == `)` && s.inter_start {
s.inter_end = true
s.inter_start = false
next_char := if s.pos + 1 < s.text.len { s.text[s.pos + 1] } else { `\0` }
if next_char == s.quote {
s.inside_string = false
}
return scan_res(.rpar, '')
}
// all other tokens
match c {
`+` {
@@ -383,8 +394,7 @@ fn (s mut Scanner) scan() ScanRes {
return scan_res(.rsbr, '')
}
`{` {
// Skip { in ${ in strings
// }
// Skip { in `${` in strings
if s.inside_string {
return s.scan()
}