Changeset c715e5f for src

Timestamp:

May 25, 2022, 5:51:24 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

c3b9d639

Parents:

5024df4

Message:

Removed most of the exception macros (EHM_ group). Made changes to the exception declaration pass to do so.

Location:

src

Files:

• CodeGen/GenType.cc (modified) (4 diffs)
• ControlStruct/ExceptDecl.cc (modified) (6 diffs)

src/CodeGen/GenType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May  1 15:24:00 2019
-// Update Count     : 23
+// Last Modified On : Fri May 20 11:18:00 2022
+// Update Count     : 24
 //
 #include "GenType.h"
@@ -50 +50 @@
                 void postvisit( TraitInstType * inst );
                 void postvisit( TypeofType * typeof );
+                void postvisit( VTableType * vtable );
                 void postvisit( QualifiedType * qualType );
 
@@ -259 +260 @@
                         if ( options.genC ) {
                                 typeString = "enum " + typeString;
-                        } 
-                } 
+                        }
+                }
                 handleQualifiers( enumInst );
         }
 
         void GenType::postvisit( TypeInstType * typeInst ) {
+                assertf( ! options.genC, "Type instance types should not reach code generation." );
                 typeString = typeInst->name + " " + typeString;
                 handleQualifiers( typeInst );
@@ -320 +322 @@
         }
 
+        void GenType::postvisit( VTableType * vtable ) {
+                assertf( ! options.genC, "Virtual table types should not reach code generation." );
+                std::ostringstream os;
+                os << "vtable(" << genType( vtable->base, "", options ) << ") " << typeString;
+                typeString = os.str();
+                handleQualifiers( vtable );
+        }
+
         void GenType::postvisit( QualifiedType * qualType ) {
                 assertf( ! options.genC, "Qualified types should not reach code generation." );

src/ControlStruct/ExceptDecl.cc

@@ -9 +9 @@
 // Author           : Henry Xue
 // Created On       : Tue Jul 20 04:10:50 2021
-// Last Modified By : Henry Xue
-// Last Modified On : Tue Aug 03 10:42:26 2021
-// Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May 25 16:43:00 2022
+// Update Count     : 5
 //
 
@@ -39 +39 @@
 }
 
-TypeInstType * makeExceptInstType(
-        const std::string & exceptionName,
-        const std::list< Expression *> & parameters
-) {
-        TypeInstType * exceptInstType = new TypeInstType(
+StructInstType * makeExceptInstType(
+        const std::string & exceptionName,
+        const std::list< Expression *> & parameters
+) {
+        StructInstType * exceptInstType = new StructInstType(
                 noQualifiers,
-                exceptionName,
-                false
+                exceptionName
         );
         cloneAll( parameters, exceptInstType->parameters );
@@ -151 +150 @@
                 nullptr,
                 new PointerType( noQualifiers,
-                        new TypeInstType( Type::Const, "__cfavir_type_info", false ) ),
+                        new StructInstType( Type::Const, "__cfavir_type_info" ) ),
                 nullptr
         ) );
@@ -257 +256 @@
         const std::string & exceptionName,
         const std::list< TypeDecl *> & forallClause,
-        const std::list< Expression *> & parameters, 
+        const std::list< Expression *> & parameters,
         const std::list< Declaration *> & members
 ) {
@@ -302 +301 @@
 ObjectDecl * ehmExternVtable(
         const std::string & exceptionName,
-        const std::list< Expression *> & parameters, 
+        const std::list< Expression *> & parameters,
         const std::string & tableName
 ) {
@@ -457 +456 @@
 }
 
+class VTableCore : public WithDeclsToAdd {
+public:
+        // Remove any remaining vtable type nodes in the tree.
+        Type * postmutate( VTableType * vtableType );
+};
+
+Type * VTableCore::postmutate( VTableType * vtableType ) {
+        auto inst = strict_dynamic_cast<ReferenceToType *>( vtableType->base );
+
+        std::string vtableName = Virtual::vtableTypeName( inst->name );
+        StructInstType * newType = new StructInstType( noQualifiers, vtableName );
+        cloneAll( inst->parameters, newType->parameters );
+
+        delete vtableType;
+        return newType;
+}
+
 void translateExcept( std::list< Declaration *> & translationUnit ) {
         PassVisitor<ExceptDeclCore> translator;
         mutateAll( translationUnit, translator );
-}
-
-}
+        PassVisitor<VTableCore> typeTranslator;
+        mutateAll( translationUnit, typeTranslator );
+}
+
+}