Changeset 815c6ae

Timestamp:

Jul 20, 2021, 12:58:12 PM (3 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

3d7d407, 54651005

Parents:

1f8dbfe (diff), ba8547e (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

Files:

• src/CompilationState.cc (modified) (2 diffs)
• src/CompilationState.h (modified) (2 diffs)
• src/ControlStruct/ExceptDecl.cc (added)
• src/ControlStruct/ExceptDecl.h (added)
• src/ControlStruct/module.mk (modified) (1 diff)
• src/Parser/TypeData.cc (modified) (2 diffs)
• src/SynTree/Declaration.h (modified) (2 diffs)
• src/main.cc (modified) (4 diffs)
• tests/polymorphism.cfa (modified) (2 diffs)

src/CompilationState.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Mon Ju1 30 10:47:01 2018
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri May  3 13:45:23 2019
-// Update Count     : 4
+// Last Modified By : Henry Xue
+// Last Modified On : Tue Jul 20 04:27:35 2021
+// Update Count     : 5
 //
 
@@ -23 +23 @@
         ctorinitp = false,
         declstatsp = false,
+        exdeclp = false,
         exprp = false,
         expraltp = false,

src/CompilationState.h

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Mon Ju1 30 10:47:01 2018
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri May  3 13:43:21 2019
-// Update Count     : 4
+// Last Modified By : Henry Xue
+// Last Modified On : Tue Jul 20 04:27:35 2021
+// Update Count     : 5
 //
 
@@ -22 +22 @@
         ctorinitp,
         declstatsp,
+        exdeclp,
         exprp,
         expraltp,

src/ControlStruct/module.mk

@@ -10 +10 @@
 ## Author           : Richard C. Bilson
 ## Created On       : Mon Jun  1 17:49:17 2015
-## Last Modified By : Andrew Beach
-## Last Modified On : Wed Jun 28 16:15:00 2017
-## Update Count     : 4
+## Last Modified By : Henry Xue
+## Last Modified On : Tue Jul 20 04:10:50 2021
+## Update Count     : 5
 ###############################################################################
 
 SRC_CONTROLSTRUCT = \
+        ControlStruct/ExceptDecl.cc \
+        ControlStruct/ExceptDecl.h \
         ControlStruct/ForExprMutator.cc \
         ControlStruct/ForExprMutator.h \

src/Parser/TypeData.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:12:51 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 14 18:57:31 2021
-// Update Count     : 672
+// Last Modified By : Henry Xue
+// Last Modified On : Tue Jul 20 04:10:50 2021
+// Update Count     : 673
 //
 
@@ -778 +778 @@
           case AggregateDecl::Struct:
           case AggregateDecl::Coroutine:
+          case AggregateDecl::Exception:
           case AggregateDecl::Generator:
           case AggregateDecl::Monitor:

src/SynTree/Declaration.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 12 18:35:36 2021
-// Update Count     : 159
+// Last Modified By : Henry Xue
+// Last Modified On : Tue Jul 20 04:10:50 2021
+// Update Count     : 160
 //
 
@@ -300 +300 @@
 
         bool is_coroutine() { return kind == Coroutine; }
+        bool is_exception() { return kind == Exception; }
         bool is_generator() { return kind == Generator; }
         bool is_monitor  () { return kind == Monitor  ; }

src/main.cc

@@ -9 +9 @@
 // Author           : Peter Buhr and Rob Schluntz
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Mar  6 15:49:00 2021
-// Update Count     : 656
+// Last Modified By : Henry Xue
+// Last Modified On : Tue Jul 20 04:27:35 2021
+// Update Count     : 658
 //
 
@@ -49 +49 @@
 #include "Common/utility.h"                 // for deleteAll, filter, printAll
 #include "Concurrency/Waitfor.h"            // for generateWaitfor
+#include "ControlStruct/ExceptDecl.h"       // for translateExcept
 #include "ControlStruct/ExceptTranslate.h"  // for translateEHM
 #include "ControlStruct/Mutate.h"           // for mutate
@@ -305 +306 @@
                 CodeTools::fillLocations( translationUnit );
                 Stats::Time::StopBlock();
+
+                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
@@ -549 +556 @@
         // code dumps
         { "ast", astp, true, "print AST after parsing" },
+        { "exdecl", exdeclp, true, "print AST after translating exception decls" },
         { "symevt", symtabp, true, "print AST after symbol table events" },
         { "altexpr", expraltp, true, "print alternatives for expressions" },

tests/polymorphism.cfa

@@ -71 +71 @@
                 printf("  offset of inner float:  %ld\n", ((char *) & x_inner_float ) - ((char *) & x) );
 
-        void showStatic( thing(int) & x ) {
+        void showStatic( thing(long long int) & x ) {
                 printf("static:\n");
                 SHOW_OFFSETS
@@ -85 +85 @@
 
         printf("=== checkPlan9offsets\n");
-        thing(int) x;
+        thing(long long int) x;
         showStatic(x);
         showDynamic(x);