buncha small fixes for ir, parser, etc.

[henge/apc.git] / src / lexer.c

diff --git a/src/lexer.c b/src/lexer.c
index b2bb535..c22525a 100644 (file)
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -28,7 +28,8 @@
 #include <dirent.h>
 
 /* Local */
-#include "src/parser.tab.h"
+#include "apc.h"
+#include "parser.tab.h"
 #ifndef DE_STACKSIZE
 #define DE_STACKSIZE 1024
 #endif
@@ -54,8 +55,6 @@ extern //scanner.c
 int         scanner_init(void);
 extern //scanner.c
 int         scanner(void);
-static inline
-int         dredge_current_depth(void);
 extern //bison
 YYSTYPE     yylval;
 static
@@ -221,7 +220,7 @@ int lexer_lexfilename
   /* Determine the filetype of str */
   len = u8_strlen(str);
     
-  ntok += lexer_lexstring(str, len);
+  ntok = lexer_lexstring(str, len);
   
   /* Pass back filepath as end of statment operator */
   filepath = u8_strdup(lexer_get_current_filepath());