@@ -804,10 +804,10 @@ fn (mut g Gen) stmt(node ast.Stmt) {
804
804
g.write_v_source_line_info (node.pos)
805
805
if node.label.len > 0 {
806
806
if node.kind == .key_break {
807
- g.writeln ('goto $node.label \ _ _break;' )
807
+ g.writeln ('goto ${ node.label} __break;' )
808
808
} else {
809
809
// assert node.kind == .key_continue
810
- g.writeln ('goto $node.label \ _ _continue;' )
810
+ g.writeln ('goto ${ node.label} __continue;' )
811
811
}
812
812
} else {
813
813
// continue or break
@@ -945,11 +945,11 @@ fn (mut g Gen) stmt(node ast.Stmt) {
945
945
g.is_vlines_enabled = true
946
946
g.stmts (node.stmts)
947
947
if node.label.len > 0 {
948
- g.writeln ('$node.label \ _ _continue: {}' )
948
+ g.writeln ('${ node.label} __continue: {}' )
949
949
}
950
950
g.writeln ('}' )
951
951
if node.label.len > 0 {
952
- g.writeln ('$node.label \ _ _break: {}' )
952
+ g.writeln ('${ node.label} __break: {}' )
953
953
}
954
954
}
955
955
ast.ForInStmt {
@@ -974,11 +974,11 @@ fn (mut g Gen) stmt(node ast.Stmt) {
974
974
g.is_vlines_enabled = true
975
975
g.stmts (node.stmts)
976
976
if node.label.len > 0 {
977
- g.writeln ('\t $node.label \ _ _continue: {}' )
977
+ g.writeln ('\t ${ node.label} __continue: {}' )
978
978
}
979
979
g.writeln ('}' )
980
980
if node.label.len > 0 {
981
- g.writeln ('$node.label \ _ _break: {}' )
981
+ g.writeln ('${ node.label} __break: {}' )
982
982
}
983
983
}
984
984
ast.GlobalDecl {
@@ -1178,21 +1178,21 @@ fn (mut g Gen) for_in(it ast.ForInStmt) {
1178
1178
g.write ('$atmp_styp $atmp = ' )
1179
1179
g.expr (it .cond)
1180
1180
g.writeln (';' )
1181
- g.writeln ('for (int $idx = 0; $idx < $atmp \ . key_values.len; ++$idx ) {' )
1182
- g.writeln ('\t if ($atmp \ . key_values.keys[$idx ].str == 0) {continue;}' )
1181
+ g.writeln ('for (int $idx = 0; $idx < ${ atmp} .key_values.len; ++$idx ) {' )
1182
+ g.writeln ('\t if (${ atmp} .key_values.keys[$idx ].str == 0) {continue;}' )
1183
1183
if it .key_var != '_' {
1184
1184
key_styp := g.typ (it .key_type)
1185
1185
key := c_name (it .key_var)
1186
1186
// TODO: analyze whether it.key_type has a .clone() method and call .clone() for all types:
1187
1187
if it .key_type == table.string_type {
1188
- g.writeln ('\t $key_styp $key = /*kkkk */ string_clone($atmp \ . key_values.keys[$idx ]);' )
1188
+ g.writeln ('\t $key_styp $key = /*key */ string_clone(${ atmp} .key_values.keys[$idx ]);' )
1189
1189
} else {
1190
- g.writeln ('\t $key_styp $key = /*kkkk */ $atmp \ . key_values.keys[$idx ];' )
1190
+ g.writeln ('\t $key_styp $key = /*key */ ${ atmp} .key_values.keys[$idx ];' )
1191
1191
}
1192
1192
}
1193
1193
if it .val_var != '_' {
1194
1194
val_sym := g.table.get_type_symbol (it .val_type)
1195
- valstr := '(void*)($atmp \ . key_values.values + $idx * (u32)($atmp \ . value_bytes))'
1195
+ valstr := '(void*)(${ atmp} .key_values.values + $idx * (u32)(${ atmp} .value_bytes))'
1196
1196
if val_sym.kind == .function {
1197
1197
g.write ('\t ' )
1198
1198
g.write_fn_ptr_decl (val_sym.info as table.FnType , c_name (it .val_var))
@@ -1207,11 +1207,11 @@ fn (mut g Gen) for_in(it ast.ForInStmt) {
1207
1207
// g.writeln('string_free(&$key);')
1208
1208
}
1209
1209
if it .label.len > 0 {
1210
- g.writeln ('\t $it.label \ _ _continue: {}' )
1210
+ g.writeln ('\t ${ it.label} __continue: {}' )
1211
1211
}
1212
1212
g.writeln ('}' )
1213
1213
if it .label.len > 0 {
1214
- g.writeln ('\t $it.label \ _ _break: {}' )
1214
+ g.writeln ('\t ${ it.label} __break: {}' )
1215
1215
}
1216
1216
return
1217
1217
} else if it .cond_type.has_flag (.variadic) {
@@ -1240,11 +1240,11 @@ fn (mut g Gen) for_in(it ast.ForInStmt) {
1240
1240
}
1241
1241
g.stmts (it .stmts)
1242
1242
if it .label.len > 0 {
1243
- g.writeln ('\t $it.label \ _ _continue: {}' )
1243
+ g.writeln ('\t ${ it.label} __continue: {}' )
1244
1244
}
1245
1245
g.writeln ('}' )
1246
1246
if it .label.len > 0 {
1247
- g.writeln ('\t $it.label \ _ _break: {}' )
1247
+ g.writeln ('\t ${ it.label} __break: {}' )
1248
1248
}
1249
1249
}
1250
1250
@@ -5566,7 +5566,7 @@ fn (mut g Gen) gen_str_default(sym table.TypeSymbol, styp string, str_fn_name st
5566
5566
convertor = 'bool'
5567
5567
typename_ = 'bool'
5568
5568
} else {
5569
- verror ("could not generate string method for type \ '$styp \ ' " )
5569
+ verror ("could not generate string method for type '$styp '" )
5570
5570
}
5571
5571
g.type_definitions.writeln ('string ${str_fn_name} ($styp it); // auto' )
5572
5572
g.auto_str_funcs.writeln ('string ${str_fn_name} ($styp it) {' )
0 commit comments