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

Rename getVariablesAndEnumeratedValues to getInputVariablesAndEnumeratedValues 

As this function is only used for parsers (and some tests), and they only
ever care about the input variables, make the fucntion only return input
variables.  Enumerated values returned remain the same (containing all constants
from both inputs and outputs).
parent f88b7666

src/main/java/ca/mcscert/jtet/expression/VariableCollection.java

+5 −5
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ final public class VariableCollection { 


        if (outputVariables != null) {

            m_outputVariables.putAll(outputVariables.m_variables);

            m_variablesAndEnumeratedValues.putAll(outputVariables.m_variables);



            usedEnumerationTypes.addAll(outputVariables.m_enumerationTypes);

        }
@@ -91,13 +90,14 @@ final public class VariableCollection { 
    }



    /**

     * Returns a map containing all the known variables and enumeration constants.

     * Returns a map containing all the input variables and enumeration constants.

     * <p>

     * Whatever is available at a given name, it is guaranteed to be a unique name.

     * This is used for the expression parsers, to know what variables to use.  Note that all enumerated constants are

     * included, including enumerated constants from enumeration constants only included from the output variables.

     *

     * @return A map of variables and enumeration constants.

     * @return A map of input variables and enumeration constants.

     */

    public Map<String, Variable> getVariablesAndEnumeratedValues() {

    public Map<String, Variable> getInputVariablesAndEnumeratedValues() {

        return Collections.unmodifiableMap(m_variablesAndEnumeratedValues);

    }

src/main/java/ca/mcscert/jtet/parsers/MatlabParser.java

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ final public class MatlabParser { 


        ParseTree tree = parser.expression();

        ParseTreeWalker walker = new ParseTreeWalker();

        MatlabParserToExpressions listener = new MatlabParserToExpressions(variableListing.getVariablesAndEnumeratedValues());

        MatlabParserToExpressions listener = new MatlabParserToExpressions(variableListing.getInputVariablesAndEnumeratedValues());

        walker.walk(listener, tree);



        return listener.m_rootExpression;

src/main/java/ca/mcscert/jtet/parsers/PVSSimpleParser.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ final public class PVSSimpleParser { 


        ParseTree tree = parser.expression();

        ParseTreeWalker walker = new ParseTreeWalker();

        PVSParserToExpressions listener = new PVSParserToExpressions(variableListing.getVariablesAndEnumeratedValues());

        PVSParserToExpressions listener = new PVSParserToExpressions(variableListing.getInputVariablesAndEnumeratedValues());

        walker.walk(listener, tree);



        return listener.m_rootExpression;

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

+18 −18
Original line number Diff line number Diff line
@@ -54,11 +54,11 @@ public class VariableCollectionTest { 


        VariableCollection toTest = new VariableCollection(new PartialVariableCollection(vars));

        assertThat(toTest.getInputVariables().size(), is(1));

        assertThat(toTest.getVariablesAndEnumeratedValues().size(), is(1));

        assertThat(toTest.getInputVariablesAndEnumeratedValues().size(), is(1));



        assertThat(toTest.getInputVariables().get("a").name(), is("a"));

        assertThat(toTest.getInputVariables().get("a").type(), is((VariableType)RealVariableType.Type));

        assertThat(toTest.getInputVariables(), is(toTest.getVariablesAndEnumeratedValues()));

        assertThat(toTest.getInputVariables(), is(toTest.getInputVariablesAndEnumeratedValues()));

    }



    @Test
@@ -75,16 +75,16 @@ public class VariableCollectionTest { 


        assertThat(vars.getInputVariables().size(), is(0));



        assertThat(vars.getVariablesAndEnumeratedValues().size(), is(3));

        assertThat(vars.getInputVariablesAndEnumeratedValues().size(), is(3));



        assertThat(vars.getVariablesAndEnumeratedValues().get("e1").name(), is("e1"));

        assertThat(vars.getVariablesAndEnumeratedValues().get("e1").type(), is((VariableType)type));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("e1").name(), is("e1"));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("e1").type(), is((VariableType)type));



        assertThat(vars.getVariablesAndEnumeratedValues().get("e2").name(), is("e2"));

        assertThat(vars.getVariablesAndEnumeratedValues().get("e2").type(), is((VariableType)type));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("e2").name(), is("e2"));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("e2").type(), is((VariableType)type));



        assertThat(vars.getVariablesAndEnumeratedValues().get("e3").name(), is("e3"));

        assertThat(vars.getVariablesAndEnumeratedValues().get("e3").type(), is((VariableType) type));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("e3").name(), is("e3"));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("e3").type(), is((VariableType) type));

    }



    @Test
@@ -107,19 +107,19 @@ public class VariableCollectionTest { 
        assertThat(vars.getInputVariables().get("a").name(), is("a"));

        assertThat(vars.getInputVariables().get("a").type(), is((VariableType)type));



        assertThat(vars.getVariablesAndEnumeratedValues().size(), is(4));

        assertThat(vars.getInputVariablesAndEnumeratedValues().size(), is(4));



        assertThat(vars.getVariablesAndEnumeratedValues().get("a").name(), is("a"));

        assertThat(vars.getVariablesAndEnumeratedValues().get("a").type(), is((VariableType)type));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("a").name(), is("a"));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("a").type(), is((VariableType)type));



        assertThat(vars.getVariablesAndEnumeratedValues().get("e1").name(), is("e1"));

        assertThat(vars.getVariablesAndEnumeratedValues().get("e1").type(), is((VariableType)type));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("e1").name(), is("e1"));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("e1").type(), is((VariableType)type));



        assertThat(vars.getVariablesAndEnumeratedValues().get("e2").name(), is("e2"));

        assertThat(vars.getVariablesAndEnumeratedValues().get("e2").type(), is((VariableType)type));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("e2").name(), is("e2"));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("e2").type(), is((VariableType)type));



        assertThat(vars.getVariablesAndEnumeratedValues().get("e3").name(), is("e3"));

        assertThat(vars.getVariablesAndEnumeratedValues().get("e3").type(), is((VariableType)type));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("e3").name(), is("e3"));

        assertThat(vars.getInputVariablesAndEnumeratedValues().get("e3").type(), is((VariableType)type));

    }



    @Test(expected = IllegalArgumentException.class)