Changes in src/ControlStruct/ExceptDecl.cc [c715e5f:da602aec]

File:

• src/ControlStruct/ExceptDecl.cc (modified) (6 diffs)

src/ControlStruct/ExceptDecl.cc

@@ -9 +9 @@
 // Author           : Henry Xue
 // Created On       : Tue Jul 20 04:10:50 2021
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed May 25 16:43:00 2022
-// Update Count     : 5
+// Last Modified By : Henry Xue
+// Last Modified On : Tue Aug 03 10:42:26 2021
+// Update Count     : 4
 //
 
@@ -39 +39 @@
 }
 
-StructInstType * makeExceptInstType(
-        const std::string & exceptionName,
-        const std::list< Expression *> & parameters
-) {
-        StructInstType * exceptInstType = new StructInstType(
+TypeInstType * makeExceptInstType(
+        const std::string & exceptionName,
+        const std::list< Expression *> & parameters
+) {
+        TypeInstType * exceptInstType = new TypeInstType(
                 noQualifiers,
-                exceptionName
+                exceptionName,
+                false
         );
         cloneAll( parameters, exceptInstType->parameters );
@@ -150 +151 @@
                 nullptr,
                 new PointerType( noQualifiers,
-                        new StructInstType( Type::Const, "__cfavir_type_info" ) ),
+                        new TypeInstType( Type::Const, "__cfavir_type_info", false ) ),
                 nullptr
         ) );
@@ -256 +257 @@
         const std::string & exceptionName,
         const std::list< TypeDecl *> & forallClause,
-        const std::list< Expression *> & parameters,
+        const std::list< Expression *> & parameters, 
         const std::list< Declaration *> & members
 ) {
@@ -301 +302 @@
 ObjectDecl * ehmExternVtable(
         const std::string & exceptionName,
-        const std::list< Expression *> & parameters,
+        const std::list< Expression *> & parameters, 
         const std::string & tableName
 ) {
@@ -456 +457 @@
 }
 
-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 );
-}
-
-}
+}
+
+}