Rework inclusion path tokenization

Author: ChAoSUnItY

src/defs.h

@@ -200,8 +200,7 @@ typedef enum {
     T_newline,
     T_backslash,
     T_whitespace,
-    T_tab,
-    T_inclusion_path
+    T_tab
 } token_kind_t;
 
 /* Source location tracking for better error reporting */

src/globals.c

@@ -6,10 +6,12 @@
  */
 
 #pragma once
+#ifndef __SHECC_
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "defs.h"
 
@@ -1617,9 +1619,6 @@ void dbg_token(token_t *token)
     case T_backslash:
         name = "T_backslash";
         break;
-    case T_inclusion_path:
-        name = "T_inclusion_path";
-        break;
     default:
         name = "<unknown>";
         break;

src/lexer.c

@@ -5,7 +5,9 @@
  * file "LICENSE" for information on usage and redistribution of this file.
  */
 
+#ifndef __SHECC_
 #include <stdbool.h>
+#endif
 
 #include "defs.h"
 #include "globals.c"
@@ -301,30 +303,6 @@ token_t *lex_token_nt(strbuf_t *buf, source_location_t *loc, token_t *prev)
 
     loc->pos = buf->size;
 
-    /* Special treatment on file inclusion path syntax */
-    if (prev && prev->kind == T_cppd_include && (ch == '<' || ch == '"')) {
-        int sz = 0;
-        char closed_ch = ch;
-
-        ch = read(buf);
-
-        while (ch && ch != closed_ch) {
-            token_buffer[sz++] = ch;
-            ch = read(buf);
-        }
-
-        if (!ch)
-            error_at("Unenclosed inclusion path", loc);
-
-        read(buf);
-        token_buffer[sz] = '\0';
-
-        token = new_token(T_inclusion_path, loc, sz + 2);
-        token->literal = arena_strdup(TOKEN_ARENA, token_buffer);
-        loc->column += sz + 2;
-        return token;
-    }
-
     if (ch == '#') {
         if (loc->column != 1)
             error_at("Directive must be on the start of line", loc);

src/main.c

@@ -5,10 +5,12 @@
  * file "LICENSE" for information on usage and redistribution of this file.
  */
 
+#ifndef __SHECC_
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 /* Define target machine */
 #include "../config"

src/parser.c

@@ -5,9 +5,11 @@
  * file "LICENSE" for information on usage and redistribution of this file.
  */
 
+#ifndef __SHECC_
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#endif
 
 #include "../config"
 #include "defs.h"

src/peephole.c

@@ -5,7 +5,9 @@
  * file "LICENSE" for information on usage and redistribution of this file.
  */
 
+#ifndef __SHECC_
 #include <stdbool.h>
+#endif
 
 #include "defs.h"
 #include "globals.c"