Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v.pref: simplify command arg handling, add tests #21406

Merged
merged 3 commits into from
May 3, 2024
Merged

v.pref: simplify command arg handling, add tests #21406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da486b0
update tests
ttytm May 2, 2024
99538e4
v.pref: simplify command arg handling
ttytm May 2, 2024
d66103a
fix
ttytm May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
59 changes: 21 additions & 38 deletions vlib/v/pref/pref.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,17 +306,12 @@ pub fn parse_args_and_show_errors(known_external_commands []string, args []strin
if os.getenv('VNORUN') != '' {
res.skip_running = true
}
mut command := ''
mut command_pos := -1

/*
$if macos || linux {
/* $if macos || linux {
res.use_cache = true
res.skip_unused = true
}
*/
} */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Imho just delete those lines. Commented code like that, without clear purpose explained in the comments, is just cruft.


// for i, arg in args {
mut command, mut command_idx := '', 0
for i := 0; i < args.len; i++ {
arg := args[i]
match arg {
Expand Down Expand Up @@ -376,21 +371,19 @@ pub fn parse_args_and_show_errors(known_external_commands []string, args []strin
res.is_help = true
}
'-q' {
if command_pos == -1 {
// a -q flag after a command is for the command, not for v
res.is_quiet = true
}
res.is_quiet = true
}
'-v', '-V', '--version', '-version' {
if command_pos == -1 {
if command != '' {
// Version flags after a command are intended for the command, not for V itself.
if args[i..].len > 1 && arg == '-v' {
// With additional args after the `-v` flag, it toggles verbosity, like Clang.
// E.g.: `v -v` VS `v -v run examples/hello_world.v`.
res.is_verbose = true
} else {
command = 'version'
}
continue
}
if args[i..].len > 1 && arg == '-v' {
// With additional args after the `-v` flag, it toggles verbosity, like Clang.
// E.g.: `v -v` VS `v -v run examples/hello_world.v`.
res.is_verbose = true
} else {
command = 'version'
}
}
'-progress' {
Expand Down Expand Up @@ -919,8 +912,7 @@ pub fn parse_args_and_show_errors(known_external_commands []string, args []strin
}
if !arg.starts_with('-') {
if command == '' {
command = arg
command_pos = i
command, command_idx = arg, i
if res.is_eval_argument || command in ['run', 'crun', 'watch'] {
break
}
Expand Down Expand Up @@ -982,12 +974,10 @@ pub fn parse_args_and_show_errors(known_external_commands []string, args []strin
run_code_in_tmp_vfile_and_exit(args, mut res, '-e', 'vsh', res.eval_argument)
}

command_args := args[command_idx + 1..]
if res.is_run || res.is_crun {
if command_pos + 2 > args.len {
eprintln_exit('v run: no v files listed')
}
res.path = args[command_pos + 1]
res.run_args = args[command_pos + 2..]
res.path = command_args[0] or { eprintln_exit('v run: no v files listed') }
res.run_args = command_args[1..]
if res.path == '-' {
// `echo "println(2+5)" | v -`
contents := os.get_raw_lines_joined()
Expand All @@ -1011,15 +1001,10 @@ pub fn parse_args_and_show_errors(known_external_commands []string, args []strin
// after it to the script:
res.is_crun = true
res.path = command
res.run_args = args[command_pos + 1..]
res.run_args = command_args
} else if command == 'interpret' {
res.backend = .interpret
if command_pos + 2 > args.len {
eprintln_exit('v interpret: no v files listed')
}
res.path = args[command_pos + 1]
res.run_args = args[command_pos + 2..]

res.path = command_args[0] or { eprintln_exit('v interpret: no v files listed') }
if res.path != '' {
must_exist(res.path)
if !res.path.ends_with('.v') && os.is_executable(res.path) && os.is_file(res.path)
Expand All @@ -1028,13 +1013,11 @@ pub fn parse_args_and_show_errors(known_external_commands []string, args []strin
res.path += '.v'
}
}
res.run_args = command_args[1..]
}
if command == 'build-module' {
res.build_mode = .build_module
if command_pos + 1 >= args.len {
eprintln_exit('v build-module: no module specified')
}
res.path = args[command_pos + 1]
res.path = command_args[0] or { eprintln_exit('v build-module: no module specified') }
}
if res.ccompiler == 'musl-gcc' {
res.is_musl = true
Expand Down
6 changes: 6 additions & 0 deletions vlib/v/pref/pref_test.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,10 @@ fn test_v_cmds_and_flags() {

unkown_arg_for_cmd_res := os.execute('${vexe} build-module -xyz ${vroot}/vlib/math')
assert unkown_arg_for_cmd_res.output.trim_space() == 'Unknown argument `-xyz` for command `build-module`'

no_run_files_res := os.execute('${vexe} run')
assert no_run_files_res.output.trim_space() == 'v run: no v files listed'

no_bm_files_res := os.execute('${vexe} build-module')
assert no_bm_files_res.output.trim_space() == 'v build-module: no module specified'
}