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

compiler: fix live reload on win with auto completed filename `.\file.v`

pull/2067/head
joe-conigliaro 2019-09-22 00:08:48 +10:00 committed by Alexander Medvednikov
parent 9b7ca248f0
commit b1e1536d56
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/fn.v
View File

@ -4,7 +4,10 @@
module main
import strings
import(
os
strings
)
const (
MaxLocalVars = 50
@ -455,7 +458,7 @@ fn (p mut Parser) fn_decl() {
}
// We are in live code reload mode, call the .so loader in bg
if p.pref.is_live {
file_base := p.file_path.replace('.v', '')
file_base := os.filename(p.file_path).replace('.v', '')
if p.os != .windows && p.os != .msvc {
so_name := file_base + '.so'
p.genln('

7
compiler/live.v
View File

@ -35,13 +35,13 @@ fn (v &V) generate_hotcode_reloading_declarations() {
}
}
fn (v mut V) generate_hot_reload_code() {
fn (v &V) generate_hot_reload_code() {
mut cgen := v.cgen
// Hot code reloading
if v.pref.is_live {
file := v.dir
file_base := v.dir.replace('.v', '')
mut file := os.realpath(v.dir)
file_base := os.filename(file).replace('.v', '')
so_name := file_base + '.so'
// Need to build .so file before building the live application
// The live app needs to load this .so file on initialization.
@ -49,6 +49,7 @@ fn (v mut V) generate_hot_reload_code() {
if os.user_os() == 'windows' {
vexe = vexe.replace('\\', '\\\\')
file = file.replace('\\', '\\\\')
}
mut msvc := ''