Rename and enable concFromChoiceSuffix

Author: adamburkegh

src/main/haskell/Toothpaste.hs

@@ -463,8 +463,8 @@ mergeConcPairT (ptx1,pty1) (ptx2,pty2)
 
 
 
-concFromChoiceSuff :: (Eq a, Ord a) => PRule a
-concFromChoiceSuff = choiceChildMR concFromChoiceListSuff 
+concFromChoiceSuffix :: (Eq a, Ord a) => PRule a
+concFromChoiceSuffix = choiceChildMR concFromChoiceListSuff 
 
 concFromChoiceListSuff :: (Eq a, Ord a) => LRule a
 concFromChoiceListSuff ptl
@@ -510,6 +510,7 @@ baseRuleList = [
             TRule{rulename="loopSim",trule=loopSim},
             -- TODO TRule{rulename="loopConcSim",trule=loopConcSim},
             TRule{rulename="concFromChoice",trule=concFromChoice},
+            TRule{rulename="concFromChoiceSuffix",trule=concFromChoiceSuffix},
             TRule{rulename="loopFixToProb", trule=loopFixToProb},
             TRule{rulename="probLoopRoll", trule=loopFixToProb}
             ]

src/test/haskell/ToothpasteTest.hs

@@ -427,23 +427,23 @@ tail2Tests = [ "empty" ~: ([]::[Int],[]::[Int]) ~=? tail2 ([]::[Int] ),
                "l4" ~: ([4,5],[7,8]) ~=? tail2 [4,5,7,8] 
                ]
 
-concFromChoiceSuffTests = [ 
-    "cfcLeaf"   ~: concFromChoiceSuff la ~=? la,
-    "concNoop"  ~: concFromChoiceSuff ccab1 ~=? ccab1,
+concFromChoiceSuffixTests = [ 
+    "cfcLeaf"   ~: concFromChoiceSuffix la ~=? la,
+    "concNoop"  ~: concFromChoiceSuffix ccab1 ~=? ccab1,
     "cfcs1" ~: concP [la,lb] 2 
-                        ~=? concFromChoiceSuff( NodeN Choice [sab,sba] 2),
+                        ~=? concFromChoiceSuffix (NodeN Choice [sab,sba] 2),
     "cfcs2" ~: concP [la,lb2] 3 
-                        ~=? concFromChoiceSuff( NodeN Choice [sab,sba2] 3),
+                        ~=? concFromChoiceSuffix (NodeN Choice [sab,sba2] 3),
     "cfcs3" ~: seqP [ choiceP [la, Silent 2] 3, 
                       concP [lb,lc2] 3] 3 
-                        ~=? concFromChoiceSuff( NodeN Choice [sabc,scb2] 3),
+                        ~=? concFromChoiceSuffix (NodeN Choice [sabc,scb2] 3),
     "cfcs4" ~: seqP [ choiceP [lc,ld2] 3,  concP [la,lb2 ] 3 ] 3
-                        ~=? concFromChoiceSuff( NodeN Choice [scab,sdba2] 3) 
+                        ~=? concFromChoiceSuffix (NodeN Choice [scab,sdba2] 3) 
     ]
 
 concFromChoiceTests = concFromChoicePrefTests
                    ++ tail2Tests
-                   ++ concFromChoiceSuffTests
+                   ++ concFromChoiceSuffixTests
 
 --