Commit 11e5ed69 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Remove query count start from CVC3's grid generator. 

Since all details about n-dimensional tables are now internal to the Table
class and (eventually) the generators themselves, there is no longer a use
case for adjusting the TCC numbering offset in CVC3.  Thus just remove the
constructor, making everything simpler.
parent dce2840a

src/main/java/ca/mcscert/jtet/cvc3generator/HierarchicalGridCVC3Generator.java

+0 −5
Original line number Diff line number Diff line
@@ -44,11 +44,6 @@ import org.apache.commons.lang3.StringUtils; 
 * @author Matthew Dawson <matthew@mjdsystems.ca>

 */

final public class HierarchicalGridCVC3Generator implements HierarchicalGridBreadthFirstCheckerGenerator {



    public HierarchicalGridCVC3Generator(int queryCountStart) {

        m_currentTCC = queryCountStart;

    }



    private String generateQueryPrefix() {

        if (!m_parentCellsCVC3Code.isEmpty()){

            String output = "(";

src/test/java/ca/mcscert/jtet/cvc3generator/HierarchicalGridCVC3GeneratorTest.java

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class HierarchicalGridCVC3GeneratorTest { 


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



        String out = table.walk(new HierarchicalGridCVC3Generator(1));

        String out = table.walk(new HierarchicalGridCVC3Generator());



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

"PUSH;\n"+
@@ -118,7 +118,7 @@ public class HierarchicalGridCVC3GeneratorTest { 
        List<HierarchicalCell> nextGrid = topCells.get(1).getSubHierarchy();

        nextGrid.add(new HierarchicalCell("(x - y) > 0"));



        String out = table.walk(new HierarchicalGridCVC3Generator(1));

        String out = table.walk(new HierarchicalGridCVC3Generator());



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

                "PUSH;\n" +
@@ -173,7 +173,7 @@ public class HierarchicalGridCVC3GeneratorTest { 
        List<HierarchicalCell> nextGrid = topCells.get(1).getSubHierarchy();

        nextGrid.add(new HierarchicalCell("(x - y) > 0"));



        String out = table.walk(new HierarchicalGridCVC3Generator(1));

        String out = table.walk(new HierarchicalGridCVC3Generator());



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

                "PUSH;\n" +