Commit 886bbbd0 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Remove the GenerateVariableType from the CheckerGenerator interface. 

GenerateVariableType was an unused function outside of some internal pieces.
Thus remove it from the CheckerGenerator interface, as it doesn't need to be
exposed.  Update a few internal uses of it to use an explicit instance of a
CheckerGenerator for when it was used (inside of tests).

git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/branches/TableTool_javization@10654 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent af168534

Matlab2SMT/src/main/java/ca/mcmaster/cas/matlab2smt/CVC3Generator.java

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ final public class CVC3Generator implements CheckerGenerator{ 
        return "(NOT " + expression + ")";

    }



    @Override

    public String GenerateVariableType(VariableType type) {

        if (type instanceof RealVariableType) {

            return "REAL";

Matlab2SMT/src/main/java/ca/mcmaster/cas/matlab2smt/CheckerGenerator.java

+0 −1
Original line number Diff line number Diff line
@@ -13,5 +13,4 @@ public interface CheckerGenerator { 
    public String GenerateBinaryOperation(MatlabBinaryOperation op, String lhsExp, String rhsExp, VariableType usedType);

    public String GenerateLiterlaValue(String value, VariableType requestedType);

    public String GenerateVariableDecleration(Variable var);

    public String GenerateVariableType(VariableType type);

}

Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/FixedPointVariableTypeTest.java

+1 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ public class FixedPointVariableTypeTest { 
     */

    @Test

    public void testGetCVC3Definition() {

        CVC3Generator generator = new CVC3Generator();

        FixedPointVariableType instance = new FixedPointVariableType(true, 16, 8);

        assertEquals("BITVECTOR(16)", generator.GenerateVariableType(instance));

    }
@@ -51,6 +52,4 @@ public class FixedPointVariableTypeTest { 
        assertFalse(instance.equals(new FixedPointVariableType(true, 15, 8)));

        assertFalse(instance.equals(new FixedPointVariableType(true, 16, 7)));

    }



    CheckerGenerator generator = new CVC3Generator();

}

Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/VariableTest.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ public class VariableTest { 
        assertSame(name, var.name());

        assertSame(type, var.type());

        assertEquals(name, var.getCheckerOutput(null, new RealVariableType()));

        assertEquals(name+":"+generator.GenerateVariableType(type)+";", generator.GenerateVariableDecleration(var));

        assertEquals(name+":REAL;", generator.GenerateVariableDecleration(var));

    }



    // Verify handling of invalid type to getCheckerOutput

Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/test/BooleanVariableTypeTest.java

+1 −1
Original line number Diff line number Diff line
@@ -67,5 +67,5 @@ public class BooleanVariableTypeTest { 
        assertFalse(instance.canCastToType(new BooleanVariableType()));

    }



    CheckerGenerator generator = new CVC3Generator();

    CVC3Generator generator = new CVC3Generator();

}