pull/2209/head
parent
5ba354fa2c
commit
96c3f10a0e
|
@ -1185,7 +1185,7 @@ fn (p mut Parser) close_scope() {
|
||||||
//if p.fileis('str.v') {
|
//if p.fileis('str.v') {
|
||||||
//println('freeing str $v.name')
|
//println('freeing str $v.name')
|
||||||
//}
|
//}
|
||||||
//continue
|
continue
|
||||||
} else if v.ptr || v.typ.ends_with('*') {
|
} else if v.ptr || v.typ.ends_with('*') {
|
||||||
free_fn = 'v_ptr_free'
|
free_fn = 'v_ptr_free'
|
||||||
//continue
|
//continue
|
||||||
|
|
|
@ -247,7 +247,7 @@ fn (s mut Scanner) scan() ScanRes {
|
||||||
}
|
}
|
||||||
// End of $var, start next string
|
// End of $var, start next string
|
||||||
if s.inter_end {
|
if s.inter_end {
|
||||||
if s.text[s.pos] == `\'` {
|
if s.text[s.pos] == single_quote {
|
||||||
s.inter_end = false
|
s.inter_end = false
|
||||||
return scan_res(.str, '')
|
return scan_res(.str, '')
|
||||||
}
|
}
|
||||||
|
@ -277,7 +277,7 @@ fn (s mut Scanner) scan() ScanRes {
|
||||||
// 'asdf $b' => "b" is the last name in the string, dont start parsing string
|
// 'asdf $b' => "b" is the last name in the string, dont start parsing string
|
||||||
// at the next ', skip it
|
// at the next ', skip it
|
||||||
if s.inside_string {
|
if s.inside_string {
|
||||||
if next_char == `\'` {
|
if next_char == single_quote {
|
||||||
s.inter_end = true
|
s.inter_end = true
|
||||||
s.inter_start = false
|
s.inter_start = false
|
||||||
s.inside_string = false
|
s.inside_string = false
|
||||||
|
@ -367,7 +367,7 @@ fn (s mut Scanner) scan() ScanRes {
|
||||||
if s.inside_string {
|
if s.inside_string {
|
||||||
s.pos++
|
s.pos++
|
||||||
// TODO UNNEEDED?
|
// TODO UNNEEDED?
|
||||||
if s.text[s.pos] == `\'` {
|
if s.text[s.pos] == single_quote {
|
||||||
s.inside_string = false
|
s.inside_string = false
|
||||||
return scan_res(.str, '')
|
return scan_res(.str, '')
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue