Changeset 4ac402d

Timestamp:

Oct 31, 2023, 10:39:33 AM (7 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

58c64323

Parents:

7d55e4d

Message:

Added a missing include (not sure how that slipped through) and did some other replacements so the new ast is the source of constants.

Location:

src

Files:

• ResolvExpr/CommonType.cc (modified) (1 diff)
• ResolvExpr/ConversionCost.cc (modified) (2 diffs)
• SymTab/ManglerCommon.cc (modified) (3 diffs)

src/ResolvExpr/CommonType.cc

@@ -485 +485 @@
         // GENERATED END
         static_assert(
-                sizeof(commonTypes)/sizeof(commonTypes[0][0]) == BasicType::NUMBER_OF_BASIC_TYPES * BasicType::NUMBER_OF_BASIC_TYPES,
+                sizeof(commonTypes)/sizeof(commonTypes[0][0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES * ast::BasicType::NUMBER_OF_BASIC_TYPES,
                 "Each basic type kind should have a corresponding row in the combined type matrix"
         );

src/ResolvExpr/ConversionCost.cc

@@ -268 +268 @@
         // GENERATED END
         static_assert(
-                sizeof(costMatrix)/sizeof(costMatrix[0][0]) == BasicType::NUMBER_OF_BASIC_TYPES * BasicType::NUMBER_OF_BASIC_TYPES,
+                sizeof(costMatrix)/sizeof(costMatrix[0][0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES * ast::BasicType::NUMBER_OF_BASIC_TYPES,
                 "Missing row in the cost matrix"
         );
@@ -315 +315 @@
         // GENERATED END
         static_assert(
-                sizeof(signMatrix)/sizeof(signMatrix[0][0]) == BasicType::NUMBER_OF_BASIC_TYPES * BasicType::NUMBER_OF_BASIC_TYPES,
+                sizeof(signMatrix)/sizeof(signMatrix[0][0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES * ast::BasicType::NUMBER_OF_BASIC_TYPES,
                 "Missing row in the sign matrix"
         );

src/SymTab/ManglerCommon.cc

@@ -15 +15 @@
 
 #include "Mangler.h"
-#include "SynTree/Type.h"
-#include "SynTree/Declaration.h"
+
+#include "AST/Decl.hpp"
+#include "AST/Type.hpp"
 
 namespace SymTab {
@@ -79 +80 @@
                         // GENERATED END
                         static_assert(
-                                sizeof(basicTypes)/sizeof(basicTypes[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
+                                sizeof(basicTypes)/sizeof(basicTypes[0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES,
                                 "Each basic type kind should have a corresponding mangler letter"
                         );
 
                         const std::map<int, std::string> qualifiers = {
-                                { Type::Const, "K" },
-                                { Type::Volatile, "V" },
-                                { Type::Atomic, "DA" }, // A is array, so need something unique for atmoic. For now, go with multiletter DA
-                                { Type::Mutex, "X" },
+                                { ast::CV::Const, "K" },
+                                { ast::CV::Volatile, "V" },
+                                { ast::CV::Atomic, "DA" }, // A is array, so need something unique for atmoic. For now, go with multiletter DA
+                                { ast::CV::Mutex, "X" },
                         };
 
@@ -111 +112 @@
                         };
                         static_assert(
-                                sizeof(typeVariables) / sizeof(typeVariables[0]) == TypeDecl::NUMBER_OF_KINDS,
+                                sizeof(typeVariables) / sizeof(typeVariables[0]) == ast::TypeDecl::NUMBER_OF_KINDS,
                                 "Each type variable kind should have a corresponding mangler prefix"
                         );