Commit 5228f432 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Rename SMTLIB GenerateVariableType to GenerateType. 

Along the same pattern, SMTLIB has one kicking around.
parent 95860af1

src/main/java/ca/mcscert/jtet/smtlibchecker/SMTLIBVariablesDeclarationGenerator.java

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class SMTLIBVariablesDeclarationGenerator implements VariablesDeclaration 
            ret.append("(declare-fun ")

               .append(var.outputName())

               .append(" () ")

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

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

               .append(")\n");



            // If variable is an enumeration, make sure that it is limited to only enumeration values.
@@ -75,7 +75,7 @@ public class SMTLIBVariablesDeclarationGenerator implements VariablesDeclaration 
    /**@deprecated

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

     */

    public static String GenerateVariableType(Type type) {

    public static String GenerateType(Type type) {

        if (type instanceof RealType) {

            return "Real";

        } else if (type instanceof BooleanType) {

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

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

        BooleanType instance = new BooleanType();

        String expResult = "Bool";

        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
@@ -42,7 +42,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);

    }