Commit 171008e5 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Remove the matlab2smt, and create appropriate other packages. 

The package name matlab2smt is really ugly, and not really representative of
what it really does anymore.  Thus create an expression package for the pieces
representing an expression, and a parsers package for all parsers, including
both the variable and the Matlab parsers.  Also make
MatlabParserOperatorParseTest not rely on (now) private members.  Instead
use the toString methods to get a generator independent representation, and
test that it matches appropriately.

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

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
                    </descriptorRefs>

                    <archive>

                        <manifest>

                            <mainClass>ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.App</mainClass>

                            <mainClass>ca.mcmaster.cas.tabularexpressiontoolbox.expression.App</mainClass>

                        </manifest>

                    </archive>

                </configuration>

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

+4 −4
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 
 */

package ca.mcmaster.cas.tabularexpressiontoolbox.cvc3generator;



import ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.MatlabParser;

import ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.BooleanVariableType;

import ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.VariableParser;

import ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.CVC3Generator;

import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParser;

import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BooleanVariableType;

import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser;

import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CVC3Generator;

import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.Cell;

import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchcialGridCheckerGenerator;

import java.util.ArrayList;

src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/matlab2smt/App.java→src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/App.java

+2 −2
Original line number Diff line number Diff line 
package ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt;

package ca.mcmaster.cas.tabularexpressiontoolbox.expression;



import java.util.logging.Level;

import java.util.logging.Logger;
@@ -12,7 +12,7 @@ public class App 
{

    public static void main( String[] args )

    {

        String[] args2 = {"ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.MatlabParser", "expression", "-tree"};

        String[] args2 = {"ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParser", "expression", "-tree"};

        try {

            TestRig.main(args2);

        } catch (Exception ex) {

src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/matlab2smt/BooleanVariableType.java→src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/BooleanVariableType.java

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * To change this template, choose Tools | Templates

 * and open the template in the editor.

 */

package ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt;

package ca.mcmaster.cas.tabularexpressiontoolbox.expression;



/**

 *

src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/matlab2smt/CVC3Generator.java→src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/CVC3Generator.java

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * To change this template, choose Tools | Templates

 * and open the template in the editor.

 */

package ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt;

package ca.mcmaster.cas.tabularexpressiontoolbox.expression;



import java.math.BigDecimal;

import java.math.BigInteger;