From 27e254c73897350e9933a38ccd39f6a79c65f19f Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Wed, 23 Oct 2019 12:54:35 +0300 Subject: [PATCH] now bring _windows.v back --- vlib/compiler/module_header.v | 7 ++++--- vlib/os/{os_win.v => os_windows.v} | 0 vlib/term/{colors_win.v => colors_windows.v} | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename vlib/os/{os_win.v => os_windows.v} (100%) rename vlib/term/{colors_win.v => colors_windows.v} (100%) diff --git a/vlib/compiler/module_header.v b/vlib/compiler/module_header.v index eb8db6e124..73d67c79c6 100644 --- a/vlib/compiler/module_header.v +++ b/vlib/compiler/module_header.v @@ -37,7 +37,8 @@ fn generate_vh(mod string) { // Consts println(full_mod_path) mut vfiles := os.walk_ext(full_mod_path, '.v') - filtered := vfiles.filter(!it.ends_with('test.v') && !it.ends_with('_windows.v')) // TODO merge once filter allows it + filtered := vfiles.filter(!it.ends_with('test.v') && + !it.ends_with('_windows.v') && !it.ends_with('_win.v')) // TODO merge once filter allows it println(filtered) mut v := new_v(['foo.v']) //v.pref.generating_vh = true @@ -57,8 +58,8 @@ fn generate_vh(mod string) { } } } - result := consts.str() + fns.str().replace('\n\n', '') - out.writeln(result.replace('[ ]', '[]').replace('? ', '?')) + result := consts.str() + fns.str().replace('\n\n\n', '\n').replace('\n\n', '\n') + out.writeln(result.replace('[ ] ', '[]').replace('? ', '?')) out.close() } diff --git a/vlib/os/os_win.v b/vlib/os/os_windows.v similarity index 100% rename from vlib/os/os_win.v rename to vlib/os/os_windows.v diff --git a/vlib/term/colors_win.v b/vlib/term/colors_windows.v similarity index 100% rename from vlib/term/colors_win.v rename to vlib/term/colors_windows.v