X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=main.c;h=1ffcd998927a437459041cd79a53195b72a38465;hb=2073834b9ac89a3db8e090d0cbe1c6ec0a03b1ef;hp=006fdea863722c2d5b9c56666eb816c41b976c00;hpb=69173876f11da6ea695f7d518d5036ddcf5179a6;p=xonotic%2Fgmqcc.git diff --git a/main.c b/main.c index 006fdea..1ffcd99 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012 * Dale Weiler * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -21,46 +21,40 @@ * SOFTWARE. */ #include "gmqcc.h" -// todo CLEANUP this argitem thing typedef struct { char *name, type; } argitem; VECTOR_MAKE(argitem, items); -/* global options */ -bool opts_debug = false; -bool opts_memchk = false; -bool opts_darkplaces_stringtablebug = false; -bool opts_omit_nullcode = false; -int opts_compiler = COMPILER_GMQCC; - -static const int usage(const char *const app) { +static int usage(const char *app) { printf("usage:\n" " %s -c -oprog.dat -- compile file\n" " %s -a -oprog.dat -- assemble file\n" " %s -c -i -oprog.dat -- compile together (allowed multiple -i)\n" " %s -a -i -oprog.dat -- assemble together(allowed multiple -i)\n" " example:\n" - " %s -cfoo.qc -ibar.qc -oqc.dat -afoo.qs -ibar.qs -oqs.dat\n" - " additional flags:\n" + " %s -cfoo.qc -ibar.qc -oqc.dat -afoo.qs -ibar.qs -oqs.dat\n", app, app, app, app, app); + + printf(" additional flags:\n" " -debug -- turns on compiler debug messages\n" " -memchk -- turns on compiler memory leak check\n" " -help -- prints this help/usage text\n" - " -std -- select the QuakeC compile type (types below):\n" - " -std=qcc -- original QuakeC\n" + " -std -- select the QuakeC compile type (types below):\n"); + + printf(" -std=qcc -- original QuakeC\n" " -std=ftqecc -- fteqcc QuakeC\n" " -std=qccx -- qccx QuakeC\n" - " -std=gmqcc -- this compiler QuakeC (default selection)\n" - " codegen flags:\n" + " -std=gmqcc -- this compiler QuakeC (default selection)\n"); + + printf(" codegen flags:\n" " -fdarkplaces-string-table-bug -- patches the string table to work with bugged versions of darkplaces\n" - " -fomit-nullcode -- omits the generation of null code (will break everywhere see propsal.txt)\n", - app,app,app,app,app - ); + " -fomit-nullcode -- omits the generation of null code (will break everywhere see propsal.txt)\n"); return -1; } int main(int argc, char **argv) { - size_t itr = 0; - char *app = &argv[0][0]; - FILE *fpp = NULL; + size_t itr = 0; + char *app = &argv[0][0]; + FILE *fpp = NULL; + lex_file *lex = NULL; /* * Parse all command line arguments. This is rather annoying to do @@ -85,22 +79,39 @@ int main(int argc, char **argv) { ); return 0; } - case 'c': items_add((argitem){util_strdup(&argv[1][2]), 0}); break; /* compile */ - case 'a': items_add((argitem){util_strdup(&argv[1][2]), 1}); break; /* assemble */ - case 'i': items_add((argitem){util_strdup(&argv[1][2]), 2}); break; /* includes */ + #define param_argument(argtype) do { \ + argitem item; \ + if (argv[1][2]) { \ + item.name = util_strdup(&argv[1][2]); \ + item.type = argtype; \ + items_add(item); \ + } else { \ + ++argv; \ + --argc; \ + if (argc <= 1) \ + goto clean_params_usage; \ + item.name = util_strdup(argv[1]); \ + item.type = argtype; \ + items_add(item); \ + } \ + } while (0) + + case 'c': { param_argument(0); break; } /* compile */ + case 'a': { param_argument(1); break; } /* assemble */ + case 'i': { param_argument(2); break; } /* includes */ + #undef parm_argument default: - if (!strncmp(&argv[1][1], "debug" , 5)) { opts_debug = true; break; } - if (!strncmp(&argv[1][1], "memchk", 6)) { opts_memchk = true; break; } - if (!strncmp(&argv[1][1], "help", 4)) { + if (util_strncmpexact(&argv[1][1], "debug" , 5)) { opts_debug = true; break; } + if (util_strncmpexact(&argv[1][1], "memchk", 6)) { opts_memchk = true; break; } + if (util_strncmpexact(&argv[1][1], "help", 4)) { return usage(app); - break; } /* compiler type selection */ - if (!strncmp(&argv[1][1], "std=qcc" , 7 )) { opts_compiler = COMPILER_QCC; break; } - if (!strncmp(&argv[1][1], "std=fteqcc", 10)) { opts_compiler = COMPILER_FTEQCC; break; } - if (!strncmp(&argv[1][1], "std=qccx", 8 )) { opts_compiler = COMPILER_QCCX; break; } - if (!strncmp(&argv[1][1], "std=gmqcc", 9 )) { opts_compiler = COMPILER_GMQCC; break; } - if (!strncmp(&argv[1][1], "std=", 4 )) { + if (util_strncmpexact(&argv[1][1], "std=qcc" , 7 )) { opts_compiler = COMPILER_QCC; break; } + if (util_strncmpexact(&argv[1][1], "std=fteqcc", 10)) { opts_compiler = COMPILER_FTEQCC; break; } + if (util_strncmpexact(&argv[1][1], "std=qccx", 8 )) { opts_compiler = COMPILER_QCCX; break; } + if (util_strncmpexact(&argv[1][1], "std=gmqcc", 9 )) { opts_compiler = COMPILER_GMQCC; break; } + if (util_strncmpexact(&argv[1][1], "std=", 4 )) { printf("invalid std selection, supported types:\n" " -std=qcc -- original QuakeC\n" " -std=ftqecc -- fteqcc QuakeC\n" @@ -110,47 +121,49 @@ int main(int argc, char **argv) { } /* code specific switches */ - if (!strcmp(&argv[1][1], "fdarkplaces-stringtablebug")) { + if (util_strncmpexact(&argv[1][1], "fdarkplaces-stringtablebug", 26)) { opts_darkplaces_stringtablebug = true; break; } - if (!strcmp(&argv[1][1], "fomit-nullcode")) { + if (util_strncmpexact(&argv[1][1], "fomit-nullcode", 14)) { opts_omit_nullcode = true; break; } - return usage(app); - + return printf("invalid command line argument: %s\n",argv[1]); + } ++argv; --argc; } - /* * options could depend on another option, this is where option * validity checking like that would take place. */ - if (opts_memchk && !opts_debug) + if (opts_memchk && !opts_debug) printf("Warning: cannot enable -memchk, without -debug.\n"); - + util_debug("COM", "starting ...\n"); /* multi file multi path compilation system */ for (; itr < items_elements; itr++) { switch (items_data[itr].type) { case 0: - fpp = fopen(items_data[itr].name, "r"); - struct lex_file *lex = lex_open(fpp); - parse_gen(lex); - lex_close(lex); + lex_init (items_data[itr].name, &lex); + if (lex) { + lex_parse(lex); + lex_close(lex); + } break; case 1: asm_init (items_data[itr].name, &fpp); - asm_parse(fpp); - asm_close(fpp); + if (fpp) { + asm_parse(fpp); + asm_close(fpp); + } break; } } - util_debug("COM", "cleaning ...\n"); + util_debug("COM", "cleaning ...\n"); /* clean list */ for (itr = 0; itr < items_elements; itr++) mem_d(items_data[itr].name); @@ -158,4 +171,10 @@ int main(int argc, char **argv) { util_meminfo(); return 0; + +clean_params_usage: + for (itr = 0; itr < items_elements; itr++) + mem_d(items_data[itr].name); + mem_d(items_data); + return usage(app); }