RoundingMode: Rename variables to avoid shadowing

Author: daniel-raffler

src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java

@@ -95,20 +95,21 @@ public void floatingPointType() {
 
   @Test
   public void roundingModeVisitor() {
-    FloatingPointFormula var =
+    FloatingPointFormula variable =
         fpmgr.makeVariable("a", FloatingPointType.getSinglePrecisionFloatingPointType());
-    FloatingPointFormula f = fpmgr.sqrt(var, FloatingPointRoundingMode.NEAREST_TIES_TO_EVEN);
+    FloatingPointFormula original =
+        fpmgr.sqrt(variable, FloatingPointRoundingMode.NEAREST_TIES_TO_EVEN);
 
     for (FloatingPointRoundingMode rm : FloatingPointRoundingMode.values()) {
       if (solver == Solvers.MATHSAT5 && rm == FloatingPointRoundingMode.NEAREST_TIES_AWAY) {
         // SKIP MathSAT does not support rounding mode "nearest-ties-away"
         continue;
       }
       // Build a term with a different rounding mode, then replace it in the visitor
-      FloatingPointFormula g =
+      FloatingPointFormula substituted =
           (FloatingPointFormula)
               mgr.visit(
-                  fpmgr.sqrt(var, rm),
+                  fpmgr.sqrt(variable, rm),
                   new FormulaVisitor<Formula>() {
                     @Override
                     public Formula visitFreeVariable(Formula f, String name) {
@@ -149,7 +150,7 @@ public Formula visitQuantifier(
                   });
 
       // Check that after the substitution the rounding mode is the default again
-      assertThat(f).isEqualTo(g);
+      assertThat(original).isEqualTo(substituted);
     }
   }