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

test: fix windows test error

pull/4282/head
yuyi 2020-04-07 18:32:09 +08:00 committed by GitHub
parent fe0942043c
commit 426eb46166
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,9 +15,9 @@ import (
) )
const ( const (
c_reserved = ['delete', 'exit', 'unix', 'error', 'calloc', 'malloc', 'free', c_reserved = ['delete', 'exit', 'unix', 'error', 'calloc', 'malloc', 'free',
'panic', 'auto', 'char', 'default', 'do', 'double', 'extern', 'float', 'inline', 'panic', 'auto', 'char', 'default', 'do', 'double', 'extern', 'float', 'inline',
'int', 'long', 'register', 'restrict', 'short', 'signed', 'sizeof', 'static', 'switch', 'int', 'long', 'register', 'restrict', 'short', 'signed', 'sizeof', 'static', 'switch',
'typedef', 'union', 'unsigned', 'void', 'volatile', 'while'] 'typedef', 'union', 'unsigned', 'void', 'volatile', 'while']
) )
@ -58,7 +58,7 @@ mut:
} }
const ( const (
tabs = ['', '\t', '\t\t', '\t\t\t', '\t\t\t\t', '\t\t\t\t\t', '\t\t\t\t\t\t', tabs = ['', '\t', '\t\t', '\t\t\t', '\t\t\t\t', '\t\t\t\t\t', '\t\t\t\t\t\t',
'\t\t\t\t\t\t\t', '\t\t\t\t\t\t\t\t'] '\t\t\t\t\t\t\t', '\t\t\t\t\t\t\t\t']
) )
@ -86,7 +86,7 @@ pub fn cgen(files []ast.File, table &table.Table, pref &pref.Preferences) string
indent: -1 indent: -1
} }
g.init() g.init()
// //
mut autofree_used := false mut autofree_used := false
for file in files { for file in files {
g.file = file g.file = file
@ -115,9 +115,9 @@ pub fn cgen(files []ast.File, table &table.Table, pref &pref.Preferences) string
if g.is_test { if g.is_test {
g.write_tests_main() g.write_tests_main()
} }
// //
g.finish() g.finish()
return g.hashes() + g.includes.str() + g.typedefs.str() + g.typedefs2.str() + return g.hashes() + g.includes.str() + g.typedefs.str() + g.typedefs2.str() +
g.definitions.str() + g.gowrappers.str() + g.stringliterals.str() + g.out.str() g.definitions.str() + g.gowrappers.str() + g.stringliterals.str() + g.out.str()
} }
@ -141,7 +141,7 @@ pub fn (g mut Gen) init() {
g.write_sorted_types() g.write_sorted_types()
g.write_multi_return_types() g.write_multi_return_types()
g.definitions.writeln('// end of definitions #endif') g.definitions.writeln('// end of definitions #endif')
// //
g.stringliterals.writeln('') g.stringliterals.writeln('')
g.stringliterals.writeln('// >> string literal consts') g.stringliterals.writeln('// >> string literal consts')
g.stringliterals.writeln('void vinit_string_literals(){') g.stringliterals.writeln('void vinit_string_literals(){')
@ -205,7 +205,7 @@ pub fn (g mut Gen) typ(t table.Type) string {
return styp return styp
} }
// //
pub fn (g mut Gen) write_typedef_types() { pub fn (g mut Gen) write_typedef_types() {
for typ in g.table.types { for typ in g.table.types {
match typ.kind { match typ.kind {
@ -817,7 +817,7 @@ fn (g mut Gen) gen_fn_decl(it ast.FnDecl) {
} }
} }
*/ */
// //
g.fn_args(it.args, it.is_variadic) g.fn_args(it.args, it.is_variadic)
if it.no_body { if it.no_body {
// Just a function header. // Just a function header.
@ -1135,7 +1135,7 @@ fn (g mut Gen) expr(node ast.Expr) {
g.write('tos3("$escaped_val")') g.write('tos3("$escaped_val")')
return return
} }
escaped_val := it.val.replace_each(['"', '\\"', '\r\n', '\\n', '\n', escaped_val := it.val.replace_each(['"', '\\"', '\r\n', '\\n', '\n',
'\\n']) '\\n'])
if g.is_c_call || it.is_c { if g.is_c_call || it.is_c {
// In C calls we have to generate C strings // In C calls we have to generate C strings
@ -1361,7 +1361,7 @@ fn (g mut Gen) infix_expr(node ast.InfixExpr) {
g.expr(node.left) g.expr(node.left)
g.write(')') g.write(')')
} }
} else if node.op == .left_shift && g.table.get_type_symbol(node.left_type).kind == } else if node.op == .left_shift && g.table.get_type_symbol(node.left_type).kind ==
.array { .array {
// arr << val // arr << val
tmp := g.new_tmp_var() tmp := g.new_tmp_var()
@ -1452,7 +1452,7 @@ fn (g mut Gen) match_expr(node ast.MatchExpr) {
// sum_type_str // sum_type_str
} else if type_sym.kind == .string { } else if type_sym.kind == .string {
g.write('string_eq(') g.write('string_eq(')
// //
g.expr(node.cond) g.expr(node.cond)
g.write(', ') g.write(', ')
// g.write('string_eq($tmp, ') // g.write('string_eq($tmp, ')
@ -1547,7 +1547,7 @@ fn (g mut Gen) if_expr(node ast.IfExpr) {
// one line ?: // one line ?:
// TODO clean this up once `is` is supported // TODO clean this up once `is` is supported
// TODO: make sure only one stmt in each branch // TODO: make sure only one stmt in each branch
if node.is_expr && node.branches.len >= 2 && node.has_else && type_sym.kind != if node.is_expr && node.branches.len >= 2 && node.has_else && type_sym.kind !=
.void { .void {
g.inside_ternary = true g.inside_ternary = true
g.write('(') g.write('(')
@ -1952,7 +1952,7 @@ fn (g mut Gen) assoc(node ast.Assoc) {
} }
fn (g mut Gen) call_args(args []ast.CallArg, expected_types []table.Type) { fn (g mut Gen) call_args(args []ast.CallArg, expected_types []table.Type) {
is_variadic := expected_types.len > 0 && table.type_is(expected_types[expected_types.len - is_variadic := expected_types.len > 0 && table.type_is(expected_types[expected_types.len -
1], .variadic) 1], .variadic)
mut arg_no := 0 mut arg_no := 0
for arg in args { for arg in args {
@ -1996,7 +1996,7 @@ fn (g mut Gen) call_args(args []ast.CallArg, expected_types []table.Type) {
[inline] [inline]
fn (g mut Gen) ref_or_deref_arg(arg ast.CallArg, expected_type table.Type) { fn (g mut Gen) ref_or_deref_arg(arg ast.CallArg, expected_type table.Type) {
arg_is_ptr := table.type_is_ptr(expected_type) || table.type_idx(expected_type) in arg_is_ptr := table.type_is_ptr(expected_type) || table.type_idx(expected_type) in
table.pointer_type_idxs table.pointer_type_idxs
expr_is_ptr := table.type_is_ptr(arg.typ) || table.type_idx(arg.typ) in table.pointer_type_idxs expr_is_ptr := table.type_is_ptr(arg.typ) || table.type_idx(arg.typ) in table.pointer_type_idxs
if arg.is_mut && !arg_is_ptr { if arg.is_mut && !arg_is_ptr {
@ -2134,7 +2134,7 @@ fn (g mut Gen) write_types(types []table.TypeSymbol) {
g.definitions.writeln('EMPTY_STRUCT_DECLARATION;') g.definitions.writeln('EMPTY_STRUCT_DECLARATION;')
} }
// g.definitions.writeln('} $name;\n') // g.definitions.writeln('} $name;\n')
// //
g.definitions.writeln('};\n') g.definitions.writeln('};\n')
} }
table.Alias { table.Alias {
@ -2201,8 +2201,8 @@ fn (g Gen) sort_structs(typesa []table.TypeSymbol) []table.TypeSymbol {
// sort graph // sort graph
dep_graph_sorted := dep_graph.resolve() dep_graph_sorted := dep_graph.resolve()
if !dep_graph_sorted.acyclic { if !dep_graph_sorted.acyclic {
verror('cgen.sort_structs(): the following structs form a dependency cycle:\n' + verror('cgen.sort_structs(): the following structs form a dependency cycle:\n' +
dep_graph_sorted.display_cycles() + '\nyou can solve this by making one or both of the dependant struct fields references, eg: field &MyStruct' + dep_graph_sorted.display_cycles() + '\nyou can solve this by making one or both of the dependant struct fields references, eg: field &MyStruct' +
'\nif you feel this is an error, please create a new issue here: https://github.com/vlang/v/issues and tag @joe-conigliaro') '\nif you feel this is an error, please create a new issue here: https://github.com/vlang/v/issues and tag @joe-conigliaro')
} }
// sort types // sort types
@ -2339,7 +2339,7 @@ fn (g mut Gen) method_call(node ast.CallExpr) {
return return
} }
// TODO performance, detect `array` method differently // TODO performance, detect `array` method differently
if typ_sym.kind == .array && node.name in ['repeat', 'sort_with_compare', 'free', if typ_sym.kind == .array && node.name in ['repeat', 'sort_with_compare', 'free',
'push_many', 'trim', 'first', 'last', 'clone', 'reverse', 'slice'] { 'push_many', 'trim', 'first', 'last', 'clone', 'reverse', 'slice'] {
// && rec_sym.name == 'array' { // && rec_sym.name == 'array' {
// && rec_sym.name == 'array' && receiver_name.starts_with('array') { // && rec_sym.name == 'array' && receiver_name.starts_with('array') {
@ -2365,7 +2365,7 @@ fn (g mut Gen) method_call(node ast.CallExpr) {
g.write('/*rec*/*') g.write('/*rec*/*')
} }
g.expr(node.left) g.expr(node.left)
is_variadic := node.expected_arg_types.len > 0 && table.type_is(node.expected_arg_types[node.expected_arg_types.len - is_variadic := node.expected_arg_types.len > 0 && table.type_is(node.expected_arg_types[node.expected_arg_types.len -
1], .variadic) 1], .variadic)
if node.args.len > 0 || is_variadic { if node.args.len > 0 || is_variadic {
g.write(', ') g.write(', ')
@ -2741,7 +2741,12 @@ fn (g Gen) type_default(typ table.Type) string {
pub fn (g mut Gen) write_tests_main() { pub fn (g mut Gen) write_tests_main() {
g.definitions.writeln('int g_test_oks = 0;') g.definitions.writeln('int g_test_oks = 0;')
g.definitions.writeln('int g_test_fails = 0;') g.definitions.writeln('int g_test_fails = 0;')
g.writeln('int main() {') $if windows {
g.writeln('int wmain() {')
}
$else {
g.writeln('int main() {')
}
g.writeln('\t_vinit();') g.writeln('\t_vinit();')
g.writeln('') g.writeln('')
all_tfuncs := g.get_all_test_function_names() all_tfuncs := g.get_all_test_function_names()