mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-14 23:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #327 from Tetralux/tet/pass-args-to-run

Browse Source 
Provide a way to pass arguments to compiled executable during 'odin run program.odin'.
This commit is contained in:
gingerBill
2019-01-29 22:12:01 +00:00
committed by GitHub
parent 238a40321a 1e180d611d
commit 96ef6aa7f3
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common.cpp
View File

@@ -137,8 +137,8 @@ GB_ALLOCATOR_PROC(heap_allocator_proc) {
}
#include "unicode.cpp"
#include "string.cpp"
#include "array.cpp"
#include "string.cpp"
#include "murmurhash3.cpp"
#define for_array(index_, array_) for (isize index_ = 0; index_ < (array_).count; index_++)

24
src/main.cpp
View File

@@ -738,14 +738,32 @@ int main(int arg_count, char **arg_ptr) {
Array<String> args = setup_args(arg_count, arg_ptr);
String command = args[1];
String init_filename = {};
String run_args_string = {};
bool run_output = false;
if (command == "run") {
if (args.count < 3) {
usage(args[0]);
return 1;
}
Array<String> run_args = array_make<String>(heap_allocator(), 0, arg_count);
defer (array_free(&run_args));
isize last_non_run_arg = args.count;
for_array(i, args) {
if (args[i] == "--") {
last_non_run_arg = i;
}
if (i <= last_non_run_arg) {
continue;
}
array_add(&run_args, args[i]);
}
args = array_slice(args, 0, last_non_run_arg);
run_args_string = string_join_and_quote(heap_allocator(), run_args);
init_filename = args[2];
run_output = true;
} else if (command == "build") {
@@ -974,7 +992,7 @@ int main(int arg_count, char **arg_ptr) {
remove_temp_files(output_base);
if (run_output) {
system_exec_command_line_app("odin run", false, "%.*s.exe", LIT(output_base));
system_exec_command_line_app("odin run", false, "%.*s.exe %.*s", LIT(output_base), LIT(run_args_string));
}
#else
timings_start_section(&timings, str_lit("ld-link"));
@@ -1111,7 +1129,7 @@ int main(int arg_count, char **arg_ptr) {
if (run_output) {
output_base = path_to_full_path(heap_allocator(), output_base);
system_exec_command_line_app("odin run", false, "\"%.*s\"", LIT(output_base));
system_exec_command_line_app("odin run", false, "\"%.*s\" %.*s", LIT(output_base), LIT(run_args_string));
}
#endif
#endif

22
src/string.cpp
View File

@@ -318,6 +318,27 @@ String concatenate_strings(gbAllocator a, String const &x, String const &y) {
return make_string(data, len);
}
String string_join_and_quote(gbAllocator a, Array<String> strings) {
if (!strings.count) {
return make_string(nullptr, 0);
}
isize str_len = 0;
for (isize i = 0; i < strings.count; i++) {
str_len += strings[i].len;
}
gbString s = gb_string_make_reserve(a, str_len+strings.count); // +strings.count for spaces after args.
for (isize i = 0; i < strings.count; i++) {
if (i > 0) {
s = gb_string_append_fmt(s, " ");
}
s = gb_string_append_fmt(s, "\"%.*s\" ", LIT(strings[i]));
}
return make_string(cast(u8 *) s, gb_string_length(s));
}
String copy_string(gbAllocator a, String const &s) {
u8 *data = gb_alloc_array(a, u8, s.len+1);
gb_memmove(data, s.text, s.len);
@@ -328,7 +349,6 @@ String copy_string(gbAllocator a, String const &s) {
#if defined(GB_SYSTEM_WINDOWS)
int convert_multibyte_to_widechar(char *multibyte_input, int input_length, wchar_t *output, int output_size) {
return MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, multibyte_input, input_length, output, output_size);