mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

comptime: fix #ifdef/#endif generation

Browse Source
This commit is contained in:
Delyan Angelov
2020-04-11 12:41:48 +03:00
parent 93d2ab200f
commit b10fcc79ba
3 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -508,6 +508,7 @@ fn (g mut Gen) write_defer_stmts() {
if defer_stmt.ifdef.len > 0 {
g.writeln(defer_stmt.ifdef)
g.stmts(defer_stmt.stmts)
g.writeln('')
g.writeln('#endif')
} else {
g.stmts(defer_stmt.stmts)
@ -2755,6 +2756,7 @@ fn op_to_fn_name(name string) string {
fn comp_if_to_ifdef(name string) string {
match name {
// platforms/os-es:
'windows' {
return '_WIN32'
}
@ -2785,27 +2787,36 @@ fn comp_if_to_ifdef(name string) string {
'android' {
return '__ANDROID__'
}
'js' {
return '_VJS'
}
'solaris' {
return '__sun'
}
'haiku' {
return '__haiku__'
}
'tinyc' {
return 'tinyc'
}
'debug' {
return '_VDEBUG'
}
'linux_or_macos' {
return ''
}
//
'js' {
return '_VJS'
}
// compilers:
'tinyc' {
return '__TINYC__'
}
'clang' {
return '__clang__'
}
'mingw' {
return '__MINGW32__'
}
'msvc' {
return '_MSC_VER'
}
// other:
'debug' {
return '_VDEBUG'
}
'glibc' {
return '__GLIBC__'
}
@ -3015,24 +3026,24 @@ fn (g mut Gen) comp_if(it ast.CompIf) {
// NOTE: g.defer_ifdef is needed for defers called witin an ifdef
// in v1 this code would be completely excluded
g.defer_ifdef = if it.is_not {
'#ifndef ' + ifdef
'\n#ifndef ' + ifdef
} else {
'#ifdef ' + ifdef
'\n#ifdef ' + ifdef
}
// println('comp if stmts $g.file.path:$it.pos.line_nr')
g.stmts(it.stmts)
g.defer_ifdef = ''
if it.has_else {
g.writeln('#else')
g.writeln('\n#else')
g.defer_ifdef = if it.is_not {
'#ifdef ' + ifdef
'\n#ifdef ' + ifdef
} else {
'#ifndef ' + ifdef
'\n#ifndef ' + ifdef
}
g.stmts(it.else_stmts)
g.defer_ifdef = ''
}
g.writeln('#endif')
g.writeln('\n#endif')
}
fn (g mut Gen) go_stmt(node ast.GoStmt) {

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

@ -54,7 +54,7 @@ const (
#define V64_PRINTFORMAT "0x%"PRIx64
#elif defined(__WIN32__)
#define V64_PRINTFORMAT "0x%I64x"
#elif defined(__LINUX__) && defined(__LP64__)
#elif defined(__linux__) && defined(__LP64__)
#define V64_PRINTFORMAT "0x%lx"
#else
#define V64_PRINTFORMAT "0x%llx"