Commit 66fbbdb0 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 add51e7e

@CVC_checker/CVC_checker.m

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ classdef CVC_checker 
        

        command = 'cvc3';

        data = [];

        generator = ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.CVC3Generator();

        boolean_type = ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.BooleanVariableType();

        generator = ca.mcmaster.cas.tabularexpressiontoolbox.expression.CVC3Generator();

        boolean_type = ca.mcmaster.cas.tabularexpressiontoolbox.expression.BooleanVariableType();

        

    end

@CVC_checker/generate_file.m

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ function_name = char(function_names{1}(1)); 


code = [];

% output the input variables

inputs = ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.VariableParser(object.data.function_inputs);

inputs = ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser(object.data.function_inputs);

code = char(inputs.getCheckerOutput(object.generator))

@EMLGenerator/generate_preamble.m

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ function code = generate_preamble(object) 
code = [];

function_name = EMLGenerator.parse_inputs(object.data.function_name);

%generate input list

inputs = ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.VariableParser(object.data.function_inputs);

inputs = ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser(object.data.function_inputs);

parsed_input = inputs.getVarList();

input_iter = parsed_input.iterator()

input = [];

@GUI/smtlib_ext_call.m

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ error = object.check_call([],2); 


if (~error)

    

    inputs = ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.VariableParser(object.Data.function_inputs);

    inputs = ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser(object.Data.function_inputs);

    vars = inputs.getVarList()



    HGrid = ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalGrid

Matlab2SMT/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>