Changes in doc/working/exception/translate.c [f1a10a7:c529a24]

File:

• doc/working/exception/translate.c (modified) (7 diffs)

doc/working/exception/translate.c

@@ -1 +1 @@
 /* Translation rules for exception handling code, from Cforall to C.
  *
- * 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.
+ * 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.
  *
  * Most of these exist only after translation (in C code). The first (the
@@ -17 +15 @@
 // Currently it is a typedef for int, but later it will be a new type.
 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));
@@ -122 +116 @@
                 }
                 int match1(exception except) {
-                        {
-                                if (dynamic_cast__SomeException(except)) {
-                                        return 1;
-                                }
-                        }
-                        {
-                                OtherException err;
-                                if ( (err = dynamic_cast__OtherException(except)) &&
-                                                err.priority > 3) {
-                                        return 2;
-                                }
-                        }
-                        return 0;
+                        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;
                 }
                 __try_terminate(try1, catch1, match1);
@@ -161 +151 @@
         {
                 bool handle1(exception except) {
-                        {
-                                if (dynamic_cast__SomeException(except)) {
-                                        fiddleThing();
-                                        return true;
-                                }
-                        }
-                        {
-                                OtherException err;
-                                if ( ( err = dynamic_cast__OtherException(except) ) &&
-                                                err.priority > 3) {
-                                        twiddleWidget();
-                                        return true;
-                                }
-                        }
-                        return false;
+                        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;
+                        }
                 }
                 struct __try_resume_node data =
@@ -244 +230 @@
                 }
                 bool handle1(exception except) {
-                        {
-                                if (dynamic_cast__SomeException(except)) {
-                                        fiddleThing();
-                                        return true;
-                                }
-                        }
-                        return false;
+                        if (dynamic_cast__SomeException(except)) {
+                                fiddleThing();
+                                return true;
+                        } else {
+                                return false;
+                        }
                 }
                 struct __cleanup_hook generated_name
@@ -288 +273 @@
         {
                 bool handle1() {
-                        {
-                                if (dynamic_cast__OtherException(except)) {
-                                        twiddleWidget();
-                                        return true;
-                                }
+                        if (dynamic_cast__OtherException(except)) {
+                                twiddleWidget();
+                                return true;
                         }
                         return false;
@@ -314 +297 @@
                 }
                 int match1(exception except) {
-                        {
-                                if (dynamic_cast__SomeException(except)) {
-                                        return 1;
-                                }
+                        if (dynamic_cast__SomeException(except)) {
+                                return 1;
                         }
                         return 0;