Commit 95860af1 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Rename CVC3's GenerateVariableType to GenerateType. 

Along the same theme, more VariableType renames.
parent 3db225be

src/main/java/ca/mcscert/jtet/cvc3generator/CVC3VariablesDeclarationGenerator.java

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ final public class CVC3VariablesDeclarationGenerator implements VariablesDeclara 
        for(Variable var : variables) {

            ret.append(var.outputName())

               .append(":")

               .append(GenerateVariableType(var.type()))

               .append(GenerateType(var.type()))

               .append(";\n");

        }
@@ -68,7 +68,7 @@ final public class CVC3VariablesDeclarationGenerator implements VariablesDeclara 
    /**@deprecated

     * it is only public for unit tests, and will be made private eventually

     */

    public String GenerateVariableType(Type type) {

    public String GenerateType(Type type) {

        if (type instanceof RealType) {

            return "REAL";

        } else if (type instanceof FixedPointType) {

src/test/java/ca/mcscert/jtet/expression/FixedPointTypeTest.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public class FixedPointTypeTest { 
    public void testGetCVC3Definition() {

        CVC3VariablesDeclarationGenerator generator = new CVC3VariablesDeclarationGenerator();

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

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

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

    }



    /**

src/test/java/ca/mcscert/jtet/expression/test/BooleanTypeTest.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ public class BooleanTypeTest { 
        String variableName = "test_variable";

        BooleanType instance = new BooleanType();

        String expResult = "BOOLEAN";

        String result = generator.GenerateVariableType(instance);

        String result = generator.GenerateType(instance);

        assertEquals(expResult, result);

    }

src/test/java/ca/mcscert/jtet/expression/test/RealTypeTest.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ public class RealTypeTest { 
        String variableName = "test_variable";

        RealType instance = new RealType();

        String expResult = "REAL";

        String result = generator.GenerateVariableType(instance);

        String result = generator.GenerateType(instance);

        assertEquals(expResult, result);

    }