ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 23:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2023 from Kelimion/help-verb

Browse Source 
Help verb
This commit is contained in:
Jeroen van Rijn
2022-09-05 22:35:13 +02:00
committed by GitHub
parent c7deff4d2e fc2cd3e1d5
commit 44eb478437
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+16 -3
View File
@@ -590,8 +590,8 @@ void usage(String argv0) {
print_usage_line(1, "version print version"); print_usage_line(1, "version print version");
print_usage_line(1, "report print information useful to reporting a bug"); print_usage_line(1, "report print information useful to reporting a bug");
print_usage_line(0, ""); print_usage_line(0, "");
print_usage_line(0, "For further details on a command, use -help after the command name"); print_usage_line(0, "For further details on a command, invoke command help:");
print_usage_line(1, "e.g. odin build -help"); print_usage_line(1, "e.g. `odin build -help` or `odin help build`");
} }
enum BuildFlagKind { enum BuildFlagKind {
@@ -2085,7 +2085,7 @@ void print_show_help(String const arg0, String const &command) {
print_usage_line(3, "-build-mode:shared Build as a dynamically linked library"); print_usage_line(3, "-build-mode:shared Build as a dynamically linked library");
print_usage_line(3, "-build-mode:obj Build as an object file"); print_usage_line(3, "-build-mode:obj Build as an object file");
print_usage_line(3, "-build-mode:object Build as an object file"); print_usage_line(3, "-build-mode:object Build as an object file");
print_usage_line(3, "-build-mode:assembly Build as an object file"); print_usage_line(3, "-build-mode:assembly Build as an assembly file");
print_usage_line(3, "-build-mode:assembler Build as an assembly file"); print_usage_line(3, "-build-mode:assembler Build as an assembly file");
print_usage_line(3, "-build-mode:asm Build as an assembly file"); print_usage_line(3, "-build-mode:asm Build as an assembly file");
print_usage_line(3, "-build-mode:llvm-ir Build as an LLVM IR file"); print_usage_line(3, "-build-mode:llvm-ir Build as an LLVM IR file");
@@ -2701,6 +2701,14 @@ int main(int arg_count, char const **arg_ptr) {
build_context.command_kind = Command_bug_report; build_context.command_kind = Command_bug_report;
print_bug_report_help(); print_bug_report_help();
return 0; return 0;
} else if (command == "help") {
if (args.count <= 2) {
usage(args[0]);
return 1;
} else {
print_show_help(args[0], args[2]);
return 0;
}
} else { } else {
usage(args[0]); usage(args[0]);
return 1; return 1;
@@ -2727,7 +2735,12 @@ int main(int arg_count, char const **arg_ptr) {
if (!single_file_package) { if (!single_file_package) {
gb_printf_err("ERROR: `%.*s %.*s` takes a package as its first argument.\n", LIT(args[0]), LIT(command)); gb_printf_err("ERROR: `%.*s %.*s` takes a package as its first argument.\n", LIT(args[0]), LIT(command));
if (init_filename == "-file") {
gb_printf_err("Did you mean `%.*s %.*s <filename.odin> -file`?\n", LIT(args[0]), LIT(command));
} else {
gb_printf_err("Did you mean `%.*s %.*s %.*s -file`?\n", LIT(args[0]), LIT(command), LIT(init_filename)); gb_printf_err("Did you mean `%.*s %.*s %.*s -file`?\n", LIT(args[0]), LIT(command), LIT(init_filename));
}
gb_printf_err("The `-file` flag tells it to treat a file as a self-contained package.\n"); gb_printf_err("The `-file` flag tells it to treat a file as a self-contained package.\n");
return 1; return 1;
} else { } else {