From 6d531fdf97806eb09c6775c02cc661b267433fec Mon Sep 17 00:00:00 2001 From: Ed_ Date: Wed, 19 Feb 2025 11:08:24 -0500 Subject: [PATCH] Fixing intellisense --- base/auxiliary/builder.hpp | 2 +- base/auxiliary/scanner.hpp | 2 +- base/components/ast.hpp | 4 +++- base/components/interface.hpp | 4 ++-- base/components/interface.parsing.cpp | 2 +- base/components/lexer.cpp | 2 +- base/components/parser.cpp | 2 +- base/components/parser_types.hpp | 3 +-- base/dependencies/debug.hpp | 5 ++--- base/dependencies/printing.cpp | 2 +- base/dependencies/printing.hpp | 2 +- base/dependencies/strings.hpp | 2 ++ base/gen.hpp | 3 --- 13 files changed, 17 insertions(+), 18 deletions(-) diff --git a/base/auxiliary/builder.hpp b/base/auxiliary/builder.hpp index 65d4d5b..f8c18c7 100644 --- a/base/auxiliary/builder.hpp +++ b/base/auxiliary/builder.hpp @@ -3,7 +3,7 @@ # include "helpers/push_ignores.inline.hpp" # include "components/header_start.hpp" # include "components/types.hpp" -# include "components/gen/ecode.hpp" +# include "components/gen/ecodetypes.hpp" # include "components/gen/eoperator.hpp" # include "components/gen/especifier.hpp" # include "components/ast.hpp" diff --git a/base/auxiliary/scanner.hpp b/base/auxiliary/scanner.hpp index 72a57b3..fbeaf11 100644 --- a/base/auxiliary/scanner.hpp +++ b/base/auxiliary/scanner.hpp @@ -3,7 +3,7 @@ # include "helpers/push_ignores.inline.hpp" # include "components/header_start.hpp" # include "components/types.hpp" -# include "components/gen/ecode.hpp" +# include "components/gen/ecodetypes.hpp" # include "components/gen/eoperator.hpp" # include "components/gen/especifier.hpp" # include "components/ast.hpp" diff --git a/base/components/ast.hpp b/base/components/ast.hpp index 0041456..bcac8ae 100644 --- a/base/components/ast.hpp +++ b/base/components/ast.hpp @@ -1,7 +1,9 @@ #ifdef INTELLISENSE_DIRECTIVES #pragma once +#include "basic_types.hpp" +#include "strings.hpp" #include "types.hpp" -#include "gen/ecode.hpp" +#include "gen/ecodetypes.hpp" #include "gen/eoperator.hpp" #include "gen/especifier.hpp" #endif diff --git a/base/components/interface.hpp b/base/components/interface.hpp index bf74f1c..97e14f2 100644 --- a/base/components/interface.hpp +++ b/base/components/interface.hpp @@ -395,11 +395,11 @@ struct ParseStackNode { ParseStackNode* Prev; - TokenSlice tokens; + TokenSlice Tokens; Token* Start; Str Name; // The name of the AST node (if parsed) Str ProcName; // The name of the procedure - Code code; // Relevant AST node + Code CodeRel; // Relevant AST node // TODO(Ed): When an error occurs, the parse stack is not released and instead the scope is left dangling. }; diff --git a/base/components/interface.parsing.cpp b/base/components/interface.parsing.cpp index cad87eb..69acb69 100644 --- a/base/components/interface.parsing.cpp +++ b/base/components/interface.parsing.cpp @@ -1,6 +1,6 @@ #ifdef INTELLISENSE_DIRECTIVES #pragma once -#include "gen/etoktype.cpp" +#include "gen/etoktype.hpp" #include "interface.upfront.cpp" #include "lexer.cpp" #include "parser.cpp" diff --git a/base/components/lexer.cpp b/base/components/lexer.cpp index f501f70..6f4ca55 100644 --- a/base/components/lexer.cpp +++ b/base/components/lexer.cpp @@ -1,7 +1,7 @@ #ifdef INTELLISENSE_DIRECTIVES #pragma once #include "interface.upfront.cpp" -#include "gen/etoktype.cpp" +#include "gen/etoktype.hpp" #endif StrBuilder tok_to_strbuilder(Token tok) diff --git a/base/components/parser.cpp b/base/components/parser.cpp index 709723d..d470021 100644 --- a/base/components/parser.cpp +++ b/base/components/parser.cpp @@ -1,6 +1,6 @@ #ifdef INTELLISENSE_DIRECTIVES #pragma once -#include "gen/etoktype.cpp" +#include "gen/etoktype.hpp" #include "parser_case_macros.cpp" #include "interface.upfront.cpp" #include "lexer.cpp" diff --git a/base/components/parser_types.hpp b/base/components/parser_types.hpp index 8969740..fb4fc9a 100644 --- a/base/components/parser_types.hpp +++ b/base/components/parser_types.hpp @@ -1,7 +1,7 @@ #ifdef INTELLISENSE_DIRECTIVES #pragma once #include "types.hpp" -#include "gen/ecode.hpp" +#include "gen/ecodetypes.hpp" #include "gen/eoperator.hpp" #include "gen/especifier.hpp" #include "gen/etoktype.hpp" @@ -110,7 +110,6 @@ struct LexContext char const* scanner; s32 line; s32 column; - // StringTable defines; Token token; }; diff --git a/base/dependencies/debug.hpp b/base/dependencies/debug.hpp index cb2970a..90a8334 100644 --- a/base/dependencies/debug.hpp +++ b/base/dependencies/debug.hpp @@ -1,9 +1,8 @@ #ifdef INTELLISENSE_DIRECTIVES # pragma once -# include "dependencies/platform.hpp" -# include "dependencies/macros.hpp" -# include "basic_types.hpp" +# include "platform.hpp" # include "macros.hpp" +# include "basic_types.hpp" #endif #pragma region Debug diff --git a/base/dependencies/printing.cpp b/base/dependencies/printing.cpp index 684f0ea..1e11be5 100644 --- a/base/dependencies/printing.cpp +++ b/base/dependencies/printing.cpp @@ -1,6 +1,6 @@ #ifdef INTELLISENSE_DIRECTIVES # pragma once -# include "strbuilder_ops.cpp" +# include "string_ops.cpp" #endif #pragma region Printing diff --git a/base/dependencies/printing.hpp b/base/dependencies/printing.hpp index 2550254..be5754c 100644 --- a/base/dependencies/printing.hpp +++ b/base/dependencies/printing.hpp @@ -1,6 +1,6 @@ #ifdef INTELLISENSE_DIRECTIVES # pragma once -# include "strbuilder_ops.hpp" +# include "string_ops.hpp" #endif #pragma region Printing diff --git a/base/dependencies/strings.hpp b/base/dependencies/strings.hpp index 866e944..69cead9 100644 --- a/base/dependencies/strings.hpp +++ b/base/dependencies/strings.hpp @@ -1,5 +1,7 @@ #ifdef INTELLISENSE_DIRECTIVES # pragma once +# include "basic_types.hpp" +# include "memory.hpp" # include "hashing.hpp" #endif diff --git a/base/gen.hpp b/base/gen.hpp index 8d3d5a9..33acd5b 100644 --- a/base/gen.hpp +++ b/base/gen.hpp @@ -11,9 +11,6 @@ #include "helpers/push_ignores.inline.hpp" #include "components/header_start.hpp" -// Has container defines pushed -#include "gen.dep.hpp" - GEN_NS_BEGIN #include "components/types.hpp"