Commit 4e589711 authored by Colin Eles's avatar Colin Eles
Browse files

fixed an issue with enum stuff

git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/trunk/TableTool@6314 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent ec930f3b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ elseif (exists == 0 || strcmp(button,'Attempt to prove'))
    %---------
    % call pvs in batch mode with script
    % ADD check that pvs actually exists in system
    [status, result] = system(['pvs -batch -v 3 -l ' function_name '.el']);
    [status, result] = system(['pvs -batch -v 3 -l ' function_name '.el'])
    %objectect.msgbox_scroll(result);
    waitbar(.70,box,'Parsing Results');
    [parsed error] = object.parse_pvs_result(result);
+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ counter = [];
counter_display = [];
enum_array = [];
if size(object.PVS_results(object.page).ce,2) == 0
    counter = ['no counter example generated'];
    counter_display = ['no counter example generated'];
    
else
    for i = 1:2:size(object.PVS_results(object.page).ce,2)
@@ -30,7 +30,7 @@ else
        % an enumerated type need to do some more work.
            
        % check if new_value contains any characters [a-zA-z]
        isstring = regexp(char(new_value),'\w','match');
        isstring = regexp(char(new_value),'[a-zA-Z]','match');
        if ~isempty(isstring)
            % value is an alpha string
            
@@ -45,7 +45,7 @@ else
        else
            % value is numeric
            eval(['value = ' char(new_value) ';']);
            new_value = value;
            new_value = num2str(value);
        end
        
        % need different string for output vs evaulation