More refactoring with extract method

Gianfrancoalongi · Dec 8, 2012 · af26cd9 · af26cd9
1 parent 95034b4
commit af26cd9
Showing 1 changed file with 26 additions and 13 deletions.
diff --git a/UT.dyalog b/UT.dyalog
@@ -21,26 +21,39 @@ EN ← ⍬
         Z ← 0
 ∇
 
+∇ Z ← exception_number_does_not_match_expected
+        Z ← #.UT.EN ≢ ⎕EN
+∇
+
+∇ Z ← failure_exception_failed Function
+        Function display_expected_got #.UT.EN ⎕EN
+        Z ← 0
+∇
+
+∇ Z ← Function check_success_or_failure Res
+        :If expecting_an_exception
+                Z ← failure_due_to_no_exception Function
+        :Else
+                :If test_failure Res
+                        Z ← Function failure_test_failed Res
+                :Else
+                        Z ← Res
+                :EndIf
+        :EndIf
+∇
+
 ∇ Z ← run Function;Res;Tmp
         Tmp ← 1 ⊃ ⎕RSI
         Tmp ← (⍕ ⎕THIS) ⎕NS ((⍕ Tmp),'.',Function)
         :Trap 0                
                 Res ← execute_function Function
+                Z ← Function check_success_or_failure Res
+        :Else
                 :If expecting_an_exception
-                        Z ← failure_due_to_no_exception Function
+                        :If exception_number_does_not_match_expected
-                :Else
+                                Z ← failure_exception_failed Function
-                        :If test_failure Res
-                                Z ← Function failure_test_failed Res
                         :Else
-                                Z ← Res
+                                Z ← 1
-                        :EndIf
-                :EndIf
-        :Else
-                :If #.UT.EN ≢ ⍬
-                        Z ← 1
-                        :If #.UT.EN ≢ ⎕EN                                
-                                Function display_expected_got #.UT.EN ⎕EN
-                                Z ← 0                        
                         :EndIf
                         #.UT.EN ← ⍬
                 :Else