another TernaryPushdownStrings bug fix (issue #236)

SpartanRefactoring · Sep 20, 2016 · 3be8271 · 3be8271
1 parent d029060
commit 3be8271
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/il/org/spartan/spartanizer/wrings/TernaryPushdownStrings.java b/src/main/java/il/org/spartan/spartanizer/wrings/TernaryPushdownStrings.java
@@ -76,7 +76,7 @@ private static int lastDifference(final String s1, final String s2) {
     for (int ¢ = 0; ¢ < s1.length(); ++¢) {
       if (!Character.isAlphabetic(last(s1, ¢)) && !Character.isAlphabetic(last(s2, ¢))
           || ¢ == s1.length() - 1 && !Character.isAlphabetic(last(s2, ¢)))
-        $ = ¢ + 1;
+        $ = last(s1, ¢) != last(s2, ¢) ? ¢ : ¢ + 1;
       if (last(s1, ¢) != last(s2, ¢))
         return $;
     }
@@ -139,10 +139,7 @@ private static Expression simplify(final Expression condition, final InfixExpres
   }
 
   private static Expression simplify(final Expression condition, final String then, final String elze) {
-    return simplify(condition, then, elze, firstDifference(then, elze));
-  }
-
-  private static Expression simplify(final Expression condition, final String then, final String elze, final int commonPrefixIndex) {
+    final int commonPrefixIndex = firstDifference(then, elze);
     if (commonPrefixIndex != 0)
       return replacementPrefix(then, elze, commonPrefixIndex, condition);
     final int commonSuffixLength = lastDifference(then, elze);

diff --git a/src/test/java/il/org/spartan/spartanizer/wrings/Issue236Test.java b/src/test/java/il/org/spartan/spartanizer/wrings/Issue236Test.java
@@ -29,4 +29,12 @@ public class Issue236Test {
         .gives("\"something\" + (b? \"\" : \" else\")").stays();
   }
 
+  @Test public void issue236_03() {
+    trimmingOf("isIncrement(¢) ? \"++\" : \"--\"").stays();
+  }
+
+  @Test public void issue236_04() {
+    trimmingOf("isIncrement(¢) ? \"++x\" : \"--x\"").gives("(isIncrement(¢) ? \"++\" : \"--\")+\"x\"").stays();
+  }
+
 }