From 5343fad59a457f79a128986b9fe8a179f36ccc4c Mon Sep 17 00:00:00 2001
From: Colin Eles <elesc@mcmaster.ca>
Date: Tue, 15 Feb 2011 19:08:27 +0000
Subject: [PATCH] fixed a bug with trig libraries

git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/trunk/TableTool@6916 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
---
 @CVC_checker/cvc_check.m             | 2 +-
 @PVS_checker/pvs_check.m             | 2 +-
 @PVS_checker/pvs_check_for_imports.m | 3 ++-
 @Settings/init.m                     | 2 +-
 @Settings/setvalues.m                | 3 +--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/@CVC_checker/cvc_check.m b/@CVC_checker/cvc_check.m
index c13462e..8dc62b8 100644
--- a/@CVC_checker/cvc_check.m
+++ b/@CVC_checker/cvc_check.m
@@ -21,7 +21,7 @@ function [ check, seqs ] = cvc_check( object )
     waitbar(.10,box,'Running Proof');
 
     % run the cvc command
-[status, result] = system(['cvc3 ' filename ' +model']);
+[status, result] = system(['cvc3 ' filename ' +model'])
 
 % check return status for errors
 if (status ~= 0)
diff --git a/@PVS_checker/pvs_check.m b/@PVS_checker/pvs_check.m
index 13db80a..f0aff8a 100644
--- a/@PVS_checker/pvs_check.m
+++ b/@PVS_checker/pvs_check.m
@@ -42,7 +42,7 @@ if (exists == 1 && (isempty(button) || strcmp(button,'Cancel')))
     output = 'canceled';
     return;
 elseif (exists == 1 && (strcmp(button,'Open PVS')));
-    [status, result] = system(['pvs ' function_name '.pvs']);
+    [status, result] = system(['pvs ' function_name '.pvs'])
     output = 'canceled';
 elseif (exists == 0 || strcmp(button,'Attempt to prove'))
     box = waitbar(0,'Generating Proof Script');
diff --git a/@PVS_checker/pvs_check_for_imports.m b/@PVS_checker/pvs_check_for_imports.m
index 7db9fa7..e5e2c3a 100644
--- a/@PVS_checker/pvs_check_for_imports.m
+++ b/@PVS_checker/pvs_check_for_imports.m
@@ -22,7 +22,8 @@ function string = pvs_check_for_imports(object)
 
 hashtable = {{'sqrt', 'reals@sqrt'} {'sin', 'trig@trig_basic'} {'cos', 'trig@trig_basic'} {'tan', 'trig@trig_basic'}};
 for k=1:size(hashtable,2)
-            if ~isempty(regexp(object.data.function_inputs,hashtable{k}(1),'once'))
+    functions = regexp(object.data.function_inputs,hashtable{k}(1),'once')
+            if ~isempty(functions{1})
                 if (~any(ismember(found,hashtable{k}(1))))
                 string = [string 'IMPORTING ' char(hashtable{k}(2)) sprintf('\n')];
                 found = [found hashtable{k}(1)];
diff --git a/@Settings/init.m b/@Settings/init.m
index c2333b0..867e03a 100644
--- a/@Settings/init.m
+++ b/@Settings/init.m
@@ -11,6 +11,6 @@ function [] = init(object)
 object.pvs_includes = [];
 object.counter_trials = 1000;
 object.counter_range = 100;
-object.exception = 0;
+object.except = 0;
 end
 
diff --git a/@Settings/setvalues.m b/@Settings/setvalues.m
index 6072fb4..7e5a755 100644
--- a/@Settings/setvalues.m
+++ b/@Settings/setvalues.m
@@ -15,7 +15,6 @@ object.counter_range = settings.range;
 if ~isfield(settings,'except')
     settings.except = 0;
 end
-%object.except = settings.except;
-object.except = 1;
+object.except = settings.except;
 end
 
-- 
GitLab