Changeset 186b398

Timestamp:

Jun 22, 2017, 1:13:34 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

25a8631, 6ca154b

Parents:

b73bd70 (diff), 9c90718 (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:

• doc/working/exception/translate.c (modified) (7 diffs)
• src/GenPoly/Specialize.cc (modified) (1 diff)
• src/SynTree/Constant.cc (modified) (2 diffs)
• src/SynTree/Constant.h (modified) (2 diffs)

doc/working/exception/translate.c

@@ -1 +1 @@
 /* Translation rules for exception handling code, from Cforall to C.
  *
- * Note that these are not final. Names, syntax and the exact translation
- * will be updated. The first section is the shared definitions, not generated
- * by the local translations but used by the translated code.
+ * Reminder: This is not final. Besides names and things it is also going very
+ * much for correctness and simplisity over efficiency.
+ *
+ * The first section is the shared definitions, not generated by the local
+ * translations but used by the translated code.
  *
  * Most of these exist only after translation (in C code). The first (the
@@ -16 +18 @@
 typedef int exception;
 
+// Will have to be availibe to user. Consider new name. Requires tagged types.
+forall(dtype parent | tagged(parent), dtype child | tagged(child))
+parent *dynamic_cast(child *);
+
 void __throw_terminate(exception except) __attribute__((noreturn));
 void __rethrow_terminate() __attribute__((noreturn));
@@ -116 +122 @@
                 }
                 int match1(exception except) {
-                        OtherException inner_except;
-                        if (dynamic_cast__SomeException(except)) {
-                                return 1;
-                        }
-                        else if ( (inner_except = dynamic_cast__OtherException(except)) &&
-                                        inner_except.priority > 3) {
-                                return 2;
-                        }
-                        else return 0;
+                        {
+                                if (dynamic_cast__SomeException(except)) {
+                                        return 1;
+                                }
+                        }
+                        {
+                                OtherException err;
+                                if ( (err = dynamic_cast__OtherException(except)) &&
+                                                err.priority > 3) {
+                                        return 2;
+                                }
+                        }
+                        return 0;
                 }
                 __try_terminate(try1, catch1, match1);
@@ -151 +161 @@
         {
                 bool handle1(exception except) {
-                        OtherException inner_except;
-                        if (dynamic_cast__SomeException(except)) {
-                                fiddleThing();
-                                return true;
-                        } else if (dynamic_cast__OtherException(except) &&
-                                        inner_except.priority > 3) {
-                                twiddleWidget();
-                                return true;
-                        } else {
-                                return false;
-                        }
+                        {
+                                if (dynamic_cast__SomeException(except)) {
+                                        fiddleThing();
+                                        return true;
+                                }
+                        }
+                        {
+                                OtherException err;
+                                if ( ( err = dynamic_cast__OtherException(except) ) &&
+                                                err.priority > 3) {
+                                        twiddleWidget();
+                                        return true;
+                                }
+                        }
+                        return false;
                 }
                 struct __try_resume_node data =
@@ -230 +244 @@
                 }
                 bool handle1(exception except) {
-                        if (dynamic_cast__SomeException(except)) {
-                                fiddleThing();
-                                return true;
-                        } else {
-                                return false;
-                        }
+                        {
+                                if (dynamic_cast__SomeException(except)) {
+                                        fiddleThing();
+                                        return true;
+                                }
+                        }
+                        return false;
                 }
                 struct __cleanup_hook generated_name
@@ -273 +288 @@
         {
                 bool handle1() {
-                        if (dynamic_cast__OtherException(except)) {
-                                twiddleWidget();
-                                return true;
+                        {
+                                if (dynamic_cast__OtherException(except)) {
+                                        twiddleWidget();
+                                        return true;
+                                }
                         }
                         return false;
@@ -297 +314 @@
                 }
                 int match1(exception except) {
-                        if (dynamic_cast__SomeException(except)) {
-                                return 1;
+                        {
+                                if (dynamic_cast__SomeException(except)) {
+                                        return 1;
+                                }
                         }
                         return 0;

src/GenPoly/Specialize.cc

@@ -99 +99 @@
                 if ( FunctionType * fftype = getFunctionType( formalType ) ) {
                         if ( fftype->isTtype() ) return true;
+                        // conversion of 0 (null) to function type does not require tuple specialization
+                        if ( dynamic_cast< ZeroType * >( actualType ) ) return false;
                         FunctionType * aftype = getFunctionType( actualType );
                         assertf( aftype, "formal type is a function type, but actual type is not." );

src/SynTree/Constant.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 21 16:44:48 2017
-// Update Count     : 27
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Jun 22 10:11:00 2017
+// Update Count     : 28
 //
 
@@ -29 +29 @@
 
 Constant::~Constant() { delete type; }
+
+Constant Constant::from_bool( bool b ) {
+        return Constant( new BasicType( Type::Qualifiers(), BasicType::Bool ), b ? "1" : "0" , (unsigned long long int)b );
+}
 
 Constant Constant::from_int( int i ) {

src/SynTree/Constant.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 : Wed Jun 21 16:44:48 2017
-// Update Count     : 14
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Jun 22 10:13:00 2017
+// Update Count     : 15
 //
 
@@ -33 +33 @@
         void set_value( std::string newValue ) { rep = newValue; }
 
+        /// generates a boolean constant of the given bool
+        static Constant from_bool( bool b );
         /// generates an integer constant of the given int
         static Constant from_int( int i );