Some fixes and command line switches parsing

diff --git a/error.c b/error.c
index c220d72e57edd71c6af6465d1cf3c757e7da5b2e..1bd792ea2e4f2efd9978f456b895925a23d8e0d1 100644 (file)
--- a/error.c
+++ b/error.c
@@ -42,7 +42,10 @@
 static const int error_color[] = {
        CON_RED,
        CON_CYAN,
-       CON_MAGENTA
+       CON_MAGENTA,
+       CON_BLUE,
+       CON_BROWN,
+       CON_WHITE
 };
 #endif
 int error_total = 0;
@@ -51,7 +54,8 @@ int error_max   = 10;
 static const char *const error_list[] = {
        "Parsing Error:",
        "Lexing Error:",
-       "Internal Error:"
+       "Internal Error:",
+       "Compilation Error:"
 };
 
 int error(int status, const char *msg, ...) {

diff --git a/gmqcc b/gmqcc
index 5ee60435edddb90c524391dec00a7aae948bfebc..1c50928f3d25825755ac41cb5c218900a0f59668 100755 (executable)
Binary files a/gmqcc and b/gmqcc differ

diff --git a/gmqcc.h b/gmqcc.h
index da17ac0260c89f65a83a1dcac3e84f4b520a038c..162eed48be74cc43a6d1ddaf7a58c49b6fadb5cd 100644 (file)
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -1,7 +1,24 @@
 /*
- * Compiler error system, this handles the error printing, and managing
- * such as after so many errors just stop the compilation, and other
- * intereting like colors for the console.
+ * Copyright (C) 2012 
+ *     Dale Weiler
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 #ifndef DPQCC_HDR
 #define DPQCC_HDR
@@ -166,6 +183,7 @@ struct lex_file *lex_open (const char *);
 #define ERROR_LEX      (SHRT_MAX+0)
 #define ERROR_PARSE    (SHRT_MAX+1)
 #define ERROR_INTERNAL (SHRT_MAX+2)
+#define ERROR_COMPILER (SHRT_MAX+3)
 int error(int, const char *, ...);
 
 /* parse.c */

diff --git a/main.c b/main.c
index 8718a72afb74b14051b9e2b1df0ed71a223cd4f3..22662dbe04a5f4868dd6c7321d45549fca656ef8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -20,15 +20,49 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <sys/stat.h>
 #include "gmqcc.h"
 
+int usage(const char *name) {
+       printf("Usage: %s -f infile -o outfile\n", name);
+       return 0;
+}
+
 int main(int argc, char **argv) {
-       if (argc <= 1) {
-               printf("Usage: %s infile.qc outfile\n", *argv);
-               return -1;
+       struct      stat chk;
+       const char *ofile = NULL;
+       const char *ifile = NULL;
+       int i;
+       if (argc <= 2)
+               return usage(*argv);
+               
+       for (i=0; i<argc; i++) {
+               if (argc != i + 1) {
+                       switch(argv[i][0]) {
+                               case '-':
+                                       switch(argv[i][1]) {
+                                               case 'f': ifile = argv[i+1]; break;
+                                               case 'o': ofile = argv[i+1]; break;
+                                       }
+                                       break;
+                       }
+               }
        }
        
-       struct lex_file *lex = lex_open(argv[1]);
+       if (!ofile || !ifile)
+               return usage(*argv);
+       
+       printf("ifile: %s\n", ifile);
+       printf("ofile: %s\n", ofile);
+       
+       /* we check here for file existance, not in the lexer */
+       if (stat(ifile, &chk) != 0)
+               return error(ERROR_COMPILER, "source file `%s` not found\n", ifile);
+       
+       struct lex_file *lex = lex_open(ifile);
        lex_debug(lex);
        parse    (lex);
        lex_close(lex);