Commit f71a700b authored by Matthew Dawson's avatar Matthew Dawson
Browse files

And EventB's GenerateVariableType changes as well. 

EventB's GenerateVariableType is now GenerateType.  Also narrow its visibility
to private, as it doesn't need to be public.
parent 5228f432

src/main/java/ca/mcscert/jtet/eventbgenerator/EventBVariablesDeclarationGenerator.java

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import java.util.Collection; 
final public class EventBVariablesDeclarationGenerator implements VariablesDeclarationGenerator {

    public final static EventBVariablesDeclarationGenerator Generator = new EventBVariablesDeclarationGenerator();



    public String GenerateVariableType(Type type) {

    private String GenerateType(Type type) {

        if (type instanceof RealType) {

            return "ℤ";

        } else {
@@ -93,7 +93,7 @@ final public class EventBVariablesDeclarationGenerator implements VariablesDecla 
            generateInvariantXmlPre(ret, invariantsNum);

            ret.append(var.outputName());

            ret.append(" ∈ ");

            ret.append(GenerateVariableType(var.type()));

            ret.append(GenerateType(var.type()));

            ret.append(invariantXmlPost);

            invariantsNum++;

        }
@@ -134,7 +134,7 @@ final public class EventBVariablesDeclarationGenerator implements VariablesDecla 
            generateInitEventActionXmlPre(ret, actionNo);

            ret.append(var.outputName());

            ret.append(" :∈ ");

            ret.append(GenerateVariableType(var.type()));

            ret.append(GenerateType(var.type()));

            generateInitEventActionXmlPost(ret, actionNo);

            ret.append("\n");

        }