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

autofree: optional fix

pull/6368/head
Alexander Medvednikov 2020-09-13 21:36:33 +02:00
parent 2bd4355a4c
commit bffa100aa6
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vlib/v/gen/cgen.v
View File

@ -99,6 +99,7 @@ mut:
sql_side SqlExprSide // left or right, to distinguish idents in `name == name` sql_side SqlExprSide // left or right, to distinguish idents in `name == name`
inside_vweb_tmpl bool inside_vweb_tmpl bool
inside_return bool inside_return bool
inside_or_block bool
strs_to_free []string // strings.Builder strs_to_free []string // strings.Builder
inside_call bool inside_call bool
has_main bool has_main bool
@ -728,7 +729,8 @@ fn (mut g Gen) stmt(node ast.Stmt) {
defer { defer {
// If we have temporary string exprs to free after this statement, do it. e.g.: // If we have temporary string exprs to free after this statement, do it. e.g.:
// `foo('a' + 'b')` => `tmp := 'a' + 'b'; foo(tmp); string_free(&tmp);` // `foo('a' + 'b')` => `tmp := 'a' + 'b'; foo(tmp); string_free(&tmp);`
if g.pref.autofree { if g.pref.autofree && !g.inside_or_block {
// TODO remove the inside_or_block hack. strings are not freed in or{} atm
if g.strs_to_free.len != 0 { if g.strs_to_free.len != 0 {
g.writeln('// strs_to_free:') g.writeln('// strs_to_free:')
for s in g.strs_to_free { for s in g.strs_to_free {
@ -4337,6 +4339,10 @@ fn (mut g Gen) or_block(var_name string, or_block ast.OrExpr, return_type table.
cvar_name := c_name(var_name) cvar_name := c_name(var_name)
mr_styp := g.base_type(return_type) mr_styp := g.base_type(return_type)
is_none_ok := mr_styp == 'void' is_none_ok := mr_styp == 'void'
g.inside_or_block = true
defer {
g.inside_or_block = false
}
g.writeln(';') // or') g.writeln(';') // or')
if is_none_ok { if is_none_ok {
g.writeln('if (!${cvar_name}.ok && !${cvar_name}.is_none) {') g.writeln('if (!${cvar_name}.ok && !${cvar_name}.is_none) {')

4
vlib/v/tests/valgrind/1.strings_and_arrays.v
View File

@ -70,7 +70,7 @@ fn opt(s string) ?int {
fn optional_str() { fn optional_str() {
q := 'select' q := 'select'
s := 'x' s := 'query: select'
// optional fn args must be freed // optional fn args must be freed
pos2 := opt('query:$q') or { pos2 := opt('query:$q') or {
// pos := s.index('query: $q') or { // pos := s.index('query: $q') or {
@ -93,7 +93,7 @@ fn main() {
str_inter() str_inter()
match_expr() match_expr()
reassign_str() reassign_str()
// optional_str() optional_str()
// str_replace() // str_replace()
println('end') println('end')
} }