X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fapc.c;h=5bd6d73afe95a91fd3ee211991dbf347c71b3473;hp=9f267ac960e706dc5befdf5243126bbb11b5f186;hb=25a23e5134b1d9649f0279a4028b887c9deb9987;hpb=4fb15555f514c5a20245b4640fe22a8bc3010f2d

diff --git a/src/apc.c b/src/apc.c
index 9f267ac..5bd6d73 100644
--- a/src/apc.c
+++ b/src/apc.c
@@ -23,31 +23,24 @@
 
 #define DEFAULT_PAGESIZE 4096
 const char* cargs['Z'] = {0};
-const long  sys_pagesize;
-yypstate* apc_pstate;
-yycstate* apc_cstate;
-
+long  sys_pagesize;
+  
 int main(int, char*[]);
 
-
-extern //bison
-int yyparse(void);
 extern //lexer.c
-int lexer_init(void);
-extern
-int scanner_init(void);
-extern
-int scanner(yypstate*, yycstate*);
+int  lexer_init(void);
+extern //scanner.c
+int  scanner_init(void);
+extern //scanner.c
+void scanner_quit(void);
+extern //scanner.c
+int  scanner_scanpath(char const*);
 extern //ir.c
-int ir_init(void);
-
-extern //apc/parser.tab.c
-YYSTYPE yylval;
-extern
-yycstate* yycstate_new(void);
-
-extern //lexer.c
-int  lexer(void);
+int  ir_init(void);
+extern //ir.c
+int  ir_linker(void);
+extern //ir.c
+int  ir_condenser(void);
 
 /* Main entry from terminal
    parses the command line and kicks off recursive scanning
@@ -67,13 +60,12 @@ int main
   "\t\t-o\tOutput filename \t\t[a.asspak]\n"		\
   "\t\t-h\tPrint this help\n"
 #define DONE   -1
+#define SCANPATH (cargs['d'] ? cargs['d'] : "./")
 { int   opt;
 
  getopt:
   switch (opt = getopt(argc, argv, OPTS))
-  { case DONE:
-      break;
-    case 'd' :
+  { case 'd' :
     case 'o' :
       if (strnlen(optarg, MAXSTR) != MAXSTR)
         { cargs[opt] = optarg;
@@ -87,19 +79,20 @@ int main
       printf(USAGE);
       printf(USAGE_LONG);
       exit(EXIT_SUCCESS);
+    case DONE:
+      break;
   }
   if ((sys_pagesize = sysconf(_SC_PAGESIZE)) == 0)
     sys_pagesize = DEFAULT_PAGESIZE;
-
-  apc_pstate = yypstate_new();
-  apc_cstate = yycstate_new();
-  
-  if (scanner_init() || ir_init())
+  if (ir_init())
     { perror("init");
       exit(EXIT_FAILURE);
     }
-  scanner();
-  
+  if (scanner_scanpath(SCANPATH))
+    { perror("scanner");
+      exit(EXIT_FAILURE);
+    }
+  ir_linker();
+  ir_condenser();
   exit(EXIT_SUCCESS);
 }
-