Commit 248c951a authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Add a system to change the start of the TCC numbering for CVC3. 

The CVC3 generator originally insured that the TCC numbering was always unqie
for a table.  Re-add this functionality.  Specifically, when building the walker,
add a parameter to its constructor to set its starting TCC number.

git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/branches/TableTool_javization@10712 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent a09331a5

src/main/java/ca/mcmaster/cas/cvc3generator/HierarchicalGridCVC3Generator.java

+2 −1
Original line number Diff line number Diff line
@@ -34,8 +34,9 @@ import org.apache.commons.lang3.StringUtils; 
 */

final public class HierarchicalGridCVC3Generator implements HierarchcialGridCheckerGenerator {



    public HierarchicalGridCVC3Generator(VariableParser variableDefinitions) {

    public HierarchicalGridCVC3Generator(VariableParser variableDefinitions, int queryCountStart) {

        m_variableDefinitions = variableDefinitions;

        m_currentTCC = queryCountStart;

    }



    private String generateQueryPrefix() {

src/test/java/ca/mcmaster/cas/cvc3generator/HierarchicalGridCVC3GeneratorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class HierarchicalGridCVC3GeneratorTest { 
        

        nextGrid.get(1).getSubHiearchy().add(new HierarchicalCell("z == 0"));



        String out = HierarchcialGridCheckerWalkerGenerator.GenerateCheckerFromGrid(grid, new HierarchicalGridCVC3Generator(new VariableParser("x,z")));

        String out = HierarchcialGridCheckerWalkerGenerator.GenerateCheckerFromGrid(grid, new HierarchicalGridCVC3Generator(new VariableParser("x,z"), 1));

        

        String expected = "ECHO \"begin1\";\n"+

"PUSH;\n"+