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

Make matlab work. Broke inputs checking but it generally seems ok. 


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

@CVC_checker/matlab_to_cvc_syntax_translation.m

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ for i=1:size(floats,2) 
end



parser = ca.mcmaster.cas.matlab2smt.MatlabParser(var_def, matlab_string);

cvc_string = char(parser.getRootExpression().getCVC3Output())

expr = parser.getRootExpression();

cvc_string = char(expr.getCVC3Output(expr.type()))



end

@EMLGenerator/generate_preamble.m

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

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

%generate input list

parsed_input = EMLGenerator.parse_inputs(object.data.function_inputs);

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

parsed_input = inputs.getVarList();

input_iter = parsed_input.iterator()

input = [];

for i= 1:size(parsed_input,2)

    input = [input char(parsed_input{i}(1))];

    if i ~= size(parsed_input,2)

while input_iter.hasNext()

    var = input_iter.next()

    input = [input char(var.name())];

    if input_iter.hasNext()

        input = [input ','];

    end

end

@GUI/check_inputs.m

+3 −1
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ 
% Author: Colin Eles elesc@mcmaster.ca

% Organization: McMaster Centre for Software Certification

function error = check_inputs(object)

parsed_input = EMLGenerator.parse_inputs(get(object.function_inputs_control,'string'));

%parsed_input = EMLGenerator.parse_inputs(get(object.function_inputs_control,'string'));

%TODO FIX THIS!

parsed_input = [];

error = [];

for i=1:size(parsed_input,2)

    if(size(parsed_input{i},2) == 2)

@GUI/check_matlab_syntax_condition.m

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ 
% Organization: McMaster Centre for Software Certification

function error = check_matlab_syntax_condition(object,string,result)

% split the list of inputs to get inputs seperatly



%TODO FIX THIS!

error = [];

return ;

parsed_input = EMLGenerator.parse_inputs(get(object.function_inputs_control,'string'));

check_string = [];