Commit 7c467ed6 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Finally, fix up SAL's GenerateVariableType function. 

SAL's GenerateVariableType is now GenerateType, matching everyone else.
parent f71a700b

src/main/java/ca/mcscert/jtet/salgenerator/SALVariablesDeclarationGenerator.java

+3 −3
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@ public class SALVariablesDeclarationGenerator implements VariablesDeclarationGen 
            ret.append(var.outputName()).append(":");

            Type type = var.type();

            if (type.subtypePredicate() == null) {

                ret.append(GenerateVariableType(type));

                ret.append(GenerateType(type));

            } else {

                ret.append("{")

                        .append(var.outputName())

                        .append(":")

                        .append(GenerateVariableType(type))

                        .append(GenerateType(type))

                        .append("|")

                        .append(type.subtypePredicate().getCheckerOutput(SALExpressionGenerator.Generator, BooleanType.Type))

                        .append("}");
@@ -63,7 +63,7 @@ public class SALVariablesDeclarationGenerator implements VariablesDeclarationGen 
        return ret.toString();

    }



    public String GenerateVariableType(Type type) {

    public String GenerateType(Type type) {

        if (type instanceof RealType) {

            return "REAL";

        } else if (type instanceof BooleanType) {