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

cgen: fix tests

pull/4113/head
Alexander Medvednikov 2020-03-24 22:35:05 +01:00
parent 437bba5566
commit cc9537dd8a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ pub fn cgen(files []ast.File, table &table.Table) string {
// println('\ncgen "$g.file.path" nr_stmts=$file.stmts.len') // println('\ncgen "$g.file.path" nr_stmts=$file.stmts.len')
building_v := g.file.path.contains('/vlib/') || g.file.path.contains('cmd/v') building_v := g.file.path.contains('/vlib/') || g.file.path.contains('cmd/v')
is_test := g.file.path.ends_with('.vv') || g.file.path.ends_with('_test.v') is_test := g.file.path.ends_with('.vv') || g.file.path.ends_with('_test.v')
if is_test { if g.file.path.ends_with('_test.v') {
g.is_test = is_test g.is_test = is_test
} }
if g.file.path == '' || is_test || building_v { if g.file.path == '' || is_test || building_v {

16
vlib/v/gen/tests/1.c
View File

@ -21,8 +21,8 @@ typedef struct {
string arg1; string arg1;
} multi_return_int_string; } multi_return_int_string;
// end of definitions #endif // end of definitions #endif
#define pi 3 #define _const_pi 3
int pi2; // inited later int _const_pi2; // inited later
void foo(int a); void foo(int a);
void User_inc_age(User* u, int n); void User_inc_age(User* u, int n);
int get_int(string a); int get_int(string a);
@ -34,9 +34,9 @@ void variadic(varg_int a);
void ensure_cap(int required, int cap); void ensure_cap(int required, int cap);
void println(string s); void println(string s);
void matches(); void matches();
#define path_sep 10 #define _const_path_sep 10
void end(); void end();
#define localmod__pub_int_const 20 #define _const_localmod__pub_int_const 20
void localmod__pub_foo(); void localmod__pub_foo();
int localmod__get_int_10(); int localmod__get_int_10();
// variadic structs // variadic structs
@ -57,11 +57,11 @@ int main(int argc, char** argv) {
a++; a++;
foo(3); foo(3);
int ak = 10; int ak = 10;
int mypi = pi; int mypi = _const_pi;
Color color = Color_red; Color color = Color_red;
localmod__pub_foo(); localmod__pub_foo();
int ten = localmod__get_int_10(); int ten = localmod__get_int_10();
println(int_str(localmod__pub_int_const)); println(int_str(_const_localmod__pub_int_const));
int g = ((int)(3.0)); int g = ((int)(3.0));
byte* bytes = ((byte*)(0)); byte* bytes = ((byte*)(0));
User* user_ptr = (User*)memdup(&(User){ .age = 0, User* user_ptr = (User*)memdup(&(User){ .age = 0,
@ -148,7 +148,7 @@ multi_return_int_string multi_return() {
} }
void variadic(varg_int a) { void variadic(varg_int a) {
int x = path_sep; int x = _const_path_sep;
int y = true ? 1 : 0; int y = true ? 1 : 0;
} }
@ -193,7 +193,7 @@ int localmod__get_int_10() {
} }
void _vinit() { void _vinit() {
pi2 = pi; _const_pi2 = _const_pi;
} }