Changeset fc12f05 for src/SymTab/ManglerCommon.cc

Timestamp:

Nov 13, 2023, 3:43:43 AM (23 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

25f2798

Parents:

0030b508 (diff), 2174191 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/SymTab/ManglerCommon.cc (modified) (4 diffs)

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 {
@@ -39 +40 @@
                         //   - "Di" char32_t
                         //   - "Ds" char16_t
-                        const std::string basicTypes[BasicType::NUMBER_OF_BASIC_TYPES] = {
+                        const std::string basicTypes[ast::BasicType::NUMBER_OF_BASIC_TYPES] = {
                                 "b",        // _Bool
                                 "c",        // char
@@ -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"
                         );