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

Revert "Support for the printf optimisation for windows and wide strings"

Browse Source 
This reverts commit acd28fa495.
This commit is contained in:
Alexander Medvednikov 2019-07-30 18:28:00 +02:00
parent 3e458a8801
commit 79be98d2fb
4 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/fn.v
View File

@ -400,9 +400,7 @@ fn (p mut Parser) fn_decl() {
p.genln('pthread_mutex_lock(&live_fn_mutex);')
}
if f.name == 'main' || f.name == 'WinMain' {
p.genln('')
p.genln('init_consts();')
p.genln('#ifdef _WIN32\n fflush(stdout); _setmode(_fileno(stdout), _O_U8TEXT); \n#endif\n')
if p.table.imports.contains('os') {
if f.name == 'main' {
p.genln('os__args = os__init_os_args(argc, argv);')
@ -812,13 +810,7 @@ fn (p mut Parser) fn_call_args(f mut Fn) *Fn {
T := p.table.find_type(typ)
fmt := p.typ_to_fmt(typ, 0)
if fmt != '' {
// Fix for win32 unicode support
if p.os == .windows || p.os == .msvc {
//p.cgen.resetln(p.cgen.cur_line.replace('println (', '/*opt*/printf ("' + fmt + '\\n", '))
p.cgen.resetln(p.cgen.cur_line.replace('println (', '/*opt*/wprintf (L"' + fmt.replace('%.*s', '%.*S') + '\\n", '))
} else {
p.cgen.resetln(p.cgen.cur_line.replace('println (', '/*opt*/printf ("' + fmt + '\\n", '))
}
p.cgen.resetln(p.cgen.cur_line.replace('println (', '/*opt*/printf ("' + fmt + '\\n", '))
continue
}
if typ.ends_with('*') {

4
compiler/main.v
View File

@ -404,7 +404,7 @@ string _STR_TMP(const char *fmt, ...) {
// It can be skipped in single file programs
if v.pref.is_script {
//println('Generating main()...')
cgen.genln('int main() { \n#ifdef _WIN32\n fflush(stdout); _setmode(_fileno(stdout), _O_U8TEXT); \n#endif\n init_consts(); $cgen.fn_main; return 0; }')
cgen.genln('int main() { \n#ifdef _WIN32\n _setmode(_fileno(stdout), _O_U8TEXT); \n#endif\n init_consts(); $cgen.fn_main; return 0; }')
}
else {
println('panic: function `main` is undeclared in the main module')
@ -413,7 +413,7 @@ string _STR_TMP(const char *fmt, ...) {
}
// Generate `main` which calls every single test function
else if v.pref.is_test {
cgen.genln('int main() { \n#ifdef _WIN32\n fflush(stdout); _setmode(_fileno(stdout), _O_U8TEXT); \n#endif\n init_consts();')
cgen.genln('int main() { \n#ifdef _WIN32\n _setmode(_fileno(stdout), _O_U8TEXT); \n#endif\n init_consts();')
for key, f in v.table.fns {
if f.name.starts_with('test_') {
cgen.genln('$f.name();')

16
compiler/parser.v
View File

@ -2398,19 +2398,9 @@ fn (p mut Parser) string_expr() {
cur_line := p.cgen.cur_line.trim_space()
if cur_line.contains('println (') && p.tok != .plus &&
!cur_line.contains('string_add') && !cur_line.contains('eprintln') {
if p.os == .windows || p.os == .msvc {
p.cgen.resetln(cur_line.replace('println (', 'wprintf( TEXT('))// .replace('%.*s', '%.*S'))
// Emily: HACKY HACK
real_format := format.replace('%.*s', '%.*S')
real_args := args.right(1)
p.gen('$real_format\\n")$real_args')
} else {
p.cgen.resetln(cur_line.replace('println (', 'printf('))
p.gen('$format\\n$args')
}
return
p.cgen.resetln(cur_line.replace('println (', 'printf('))
p.gen('$format\\n$args')
return
}
// '$age'! means the user wants this to be a tmp string (uses global buffer, no allocation,
// won't be used again)

4
vlib/builtin/builtin.v
View File

@ -51,9 +51,7 @@ pub fn println(s string) {
panic('println(NIL)')
}
$if windows {
// HACKY HACK
// use capital s for printing regular ascii strings
C.wprintf(C.TEXT('%.*S\n'), s.len, s)
C._putws(s.to_wide())
} $else {
C.printf('%.*s\n', s.len, s.str)
}