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

os: merge with filepath

Browse Source
This commit is contained in:
yuyi
2020-03-08 05:26:26 +08:00
committed by GitHub
parent 5e541e1f11
commit 783dee1f48
57 changed files with 249 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vlib/compiler/tests/repl/repl_test.v
View File

@ -4,7 +4,6 @@ import os
import compiler.tests.repl.runner
import benchmark
import sync
import filepath
fn test_the_v_compiler_can_be_invoked() {
vexec := runner.full_path_to_v(5)
@ -64,7 +63,7 @@ fn worker_repl(p mut sync.PoolProcessor, idx int, thread_id int) voidptr {
p.set_thread_context(idx, tls_bench)
}
tls_bench.cstep = idx
tfolder := filepath.join(cdir,'vrepl_tests_$idx')
tfolder := os.join(cdir,'vrepl_tests_$idx')
if os.is_dir(tfolder) {
os.rmdir_all(tfolder)
}

21
vlib/compiler/tests/repl/runner/runner.v
View File

@ -1,9 +1,6 @@
module runner
import (
os
filepath
)
import os
pub struct RunnerOptions {
pub:
@ -20,9 +17,9 @@ pub fn full_path_to_v(dirs_in int) string {
vname := if os.user_os() == 'windows' { 'v.exe' } else { 'v' }
mut path := os.executable()
for i := 0; i < dirs_in; i++ {
path = filepath.dir(path)
path = os.dir(path)
}
vexec := filepath.join( path, vname )
vexec := os.join( path, vname )
/*
args := os.args
vreal := os.realpath('v')
@ -51,17 +48,17 @@ fn diff_files( file_result, file_expected string ) string {
}
pub fn run_repl_file(wd string, vexec string, file string) ?string {
vexec_folder := filepath.dir(vexec) + filepath.separator
vexec_folder := os.dir(vexec) + os.path_separator
fcontent := os.read_file(file) or { return error('Could not read file ${file}') }
content := fcontent.replace('\r', '')
input := content.all_before('===output===\n')
output := content.all_after('===output===\n')
fname := filepath.filename( file )
fname := os.filename( file )
input_temporary_filename := os.realpath(filepath.join( wd, 'input_temporary_filename.txt'))
input_temporary_filename := os.realpath(os.join( wd, 'input_temporary_filename.txt'))
os.write_file(input_temporary_filename, input)
os.write_file( os.realpath(filepath.join( wd, 'original.txt' ) ), fcontent )
os.write_file( os.realpath(os.join( wd, 'original.txt' ) ), fcontent )
rcmd := '"$vexec" repl -replfolder "$wd" -replprefix "${fname}." < $input_temporary_filename'
r := os.exec(rcmd) or {
os.rm(input_temporary_filename)
@ -74,7 +71,7 @@ pub fn run_repl_file(wd string, vexec string, file string) ?string {
.replace('>>>', '')
.replace('... ', '')
.all_after('Use Ctrl-C or `exit` to exit\n')
.replace(wd + filepath.separator, '' )
.replace(wd + os.path_separator, '' )
.replace(vexec_folder, '')
.replace('\\', '/')
@ -137,7 +134,7 @@ pub fn new_options() RunnerOptions {
if os.args.len > 1 {
files = os.args[1..]
} else {
os.chdir( filepath.dir(vexec) )
os.chdir( os.dir(vexec) )
wd = os.getwd()
files = os.walk_ext('.', '.repl')
}