Changeset 6a896b0

Timestamp:

Jul 18, 2022, 11:27:06 AM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

efcd8f2

Parents:

847bb6f

Message:

Translated the Exception Declaration pass.

Location:

src

Files:

• AST/Expr.cpp (modified) (1 diff)
• ControlStruct/ExceptDecl.h (modified) (2 diffs)
• ControlStruct/ExceptDeclNew.cpp (added)
• ControlStruct/module.mk (modified) (1 diff)
• Virtual/Tables.h (modified) (1 diff)
• main.cc (modified) (4 diffs)

src/AST/Expr.cpp

@@ -272 +272 @@
         // Adjust the length of the string for the terminator.
         const Expr * strSize = from_ulong( loc, str.size() + 1 );
-        const Type * strType = new ArrayType( charType, strSize, FixedLen, StaticDim );
+        const Type * strType = new ArrayType( charType, strSize, FixedLen, DynamicDim );
         const std::string strValue = "\"" + str + "\"";
         return new ConstantExpr( loc, strType, strValue, std::nullopt );

src/ControlStruct/ExceptDecl.h

@@ -9 +9 @@
 // Author           : Henry Xue
 // Created On       : Tue Jul 20 04:10:50 2021
-// Last Modified By : Henry Xue
-// Last Modified On : Tue Jul 20 04:10:50 2021
-// Update Count     : 1
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Jul 12 15:49:00 2022
+// Update Count     : 2
 //
 
@@ -20 +20 @@
 class Declaration;
 
+namespace ast {
+        class TranslationUnit;
+}
+
 namespace ControlStruct {
         void translateExcept( std::list< Declaration *> & translationUnit );
+        void translateExcept( ast::TranslationUnit & translationUnit );
 }

src/ControlStruct/module.mk

@@ -17 +17 @@
 SRC += \
         ControlStruct/ExceptDecl.cc \
+        ControlStruct/ExceptDeclNew.cpp \
         ControlStruct/ExceptDecl.h \
         ControlStruct/ExceptTranslateNew.cpp \

src/Virtual/Tables.h

@@ -19 +19 @@
 #include "AST/Fwd.hpp"
 class Declaration;
+class Expression;
+class FunctionDecl;
+class Initializer;
+class ObjectDecl;
 class StructDecl;
-class Expression;
+class StructInstType;
+class Type;
 
 namespace Virtual {

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jul 12 12:02:00 2022
-// Update Count     : 675
+// Last Modified On : Mon Jul 18 11:08:00 2022
+// Update Count     : 676
 //
 
@@ -330 +330 @@
                 Stats::Time::StopBlock();
 
-                PASS( "Translate Exception Declarations", ControlStruct::translateExcept( translationUnit ) );
-                if ( exdeclp ) {
-                        dump( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                CodeTools::fillLocations( translationUnit );
-
                 if( useNewAST ) {
-                        CodeTools::fillLocations( translationUnit );
-
                         if (Stats::Counters::enabled) {
                                 ast::pass_visitor_stats.avg = Stats::Counters::build<Stats::Counters::AverageCounter<double>>("Average Depth - New");
@@ -348 +338 @@
 
                         forceFillCodeLocations( transUnit );
+
+                        PASS( "Translate Exception Declarations", ControlStruct::translateExcept( transUnit ) );
+                        if ( exdeclp ) {
+                                dump( move( transUnit ) );
+                                return EXIT_SUCCESS;
+                        }
 
                         // Must happen before auto-gen, or anything that examines ops.
@@ -473 +469 @@
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        PASS( "Translate Exception Declarations", ControlStruct::translateExcept( translationUnit ) );
+                        if ( exdeclp ) {
+                                dump( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
                         // add the assignment statement after the initialization of a type parameter
                         PASS( "Validate", SymTab::validate( translationUnit ) );