Changeset 4e08a54 for src/SymTab

Timestamp:

Apr 19, 2024, 12:01:34 PM (22 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master, stuck-waitfor-destruct

Children:

b9b6efb

Parents:

da87eaf (diff), 02c80cdc (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

Location:

src/SymTab

Files:

• GenImplicitCall.cpp (modified) (1 diff)
• Mangler.cc (modified) (3 diffs)
• ManglerCommon.cc (modified) (2 diffs)

src/SymTab/GenImplicitCall.cpp

@@ -133 +133 @@
 
         ast::ptr< ast::DeclWithType > index = new ast::ObjectDecl(
-                loc, indexName.newName(), new ast::BasicType( ast::BasicType::SignedInt ),
+                loc, indexName.newName(), new ast::BasicType( ast::BasicKind::SignedInt ),
                 new ast::SingleInit( loc, begin ) );
         ast::ptr< ast::Expr > indexVar = new ast::VariableExpr( loc, index );

src/SymTab/Mangler.cc

@@ -58 +58 @@
         void postvisit( const ast::OneType * oneType );
         void postvisit( const ast::QualifiedType * qualType );
-
-        void postvisit( const ast::EnumPosType * posType );
+        void postvisit( const ast::EnumAttrType * posType );
 
         /// The result is the current constructed mangled name.
@@ -143 +142 @@
 void Mangler::postvisit( const ast::BasicType * basicType ) {
         printQualifiers( basicType );
-        assertf( basicType->kind < ast::BasicType::NUMBER_OF_BASIC_TYPES, "Unhandled basic type: %d", basicType->kind );
+        assertf( basicType->kind < ast::BasicKind::NUMBER_OF_BASIC_TYPES, "Unhandled basic type: %d", basicType->kind );
         mangleName += Encoding::basicTypes[ basicType->kind ];
 }
@@ -281 +280 @@
 }
 
-void Mangler::postvisit( const ast::EnumPosType * pos ) {
-        postvisit( pos->instance );
-        mangleName += "_pos";
+void Mangler::postvisit( const ast::EnumAttrType * enumAttr ) {
+        postvisit( enumAttr->instance );
+        // mangleName += "_pos";
+    switch ( enumAttr->attr )
+    {
+        case ast::EnumAttribute::Label:
+            mangleName += "_label_";
+            break;
+        case ast::EnumAttribute::Posn:
+                        mangleName += "_posn_";
+            break;
+        case ast::EnumAttribute::Value:
+            mangleName += "_value_";
+            break;
+    }
+
 }
 

src/SymTab/ManglerCommon.cc

@@ -41 +41 @@
 //   - "Di" char32_t
 //   - "Ds" char16_t
-const std::string basicTypes[ast::BasicType::NUMBER_OF_BASIC_TYPES] = {
+const std::string basicTypes[ast::BasicKind::NUMBER_OF_BASIC_TYPES] = {
         "b",        // _Bool
         "c",        // char
@@ -81 +81 @@
 // GENERATED END
 static_assert(
-        sizeof(basicTypes) / sizeof(basicTypes[0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES,
+        sizeof(basicTypes) / sizeof(basicTypes[0]) == ast::BasicKind::NUMBER_OF_BASIC_TYPES,
         "Each basic type kind should have a corresponding mangler letter"
 );