File tree 2 files changed +2
-56
lines changed
2 files changed +2
-56
lines changed Original file line number Diff line number Diff line change @@ -555,8 +555,8 @@ int goto_analyzer_parse_optionst::perform_analysis(const optionst &options)
555
555
return CPROVER_EXIT_SUCCESS;
556
556
}
557
557
558
- if (set_properties ( ))
559
- return CPROVER_EXIT_SET_PROPERTIES_FAILED ;
558
+ if (cmdline. isset ( " property " ))
559
+ ::set_properties (goto_model, cmdline.get_values( " property " )) ;
560
560
561
561
if (options.get_bool_option (" general-analysis" ))
562
562
{
@@ -665,38 +665,9 @@ int goto_analyzer_parse_optionst::perform_analysis(const optionst &options)
665
665
return CPROVER_EXIT_USAGE_ERROR;
666
666
}
667
667
668
- bool goto_analyzer_parse_optionst::set_properties ()
669
- {
670
- try
671
- {
672
- if (cmdline.isset (" property" ))
673
- ::set_properties (goto_model, cmdline.get_values(" property" ));
674
- }
675
-
676
- catch (const char *e)
677
- {
678
- error () << e << eom;
679
- return true ;
680
- }
681
-
682
- catch (const std::string &e)
683
- {
684
- error () << e << eom;
685
- return true ;
686
- }
687
-
688
- catch (int )
689
- {
690
- return true ;
691
- }
692
-
693
- return false ;
694
- }
695
-
696
668
bool goto_analyzer_parse_optionst::process_goto_program (
697
669
const optionst &options)
698
670
{
699
- try
700
671
{
701
672
#if 0
702
673
// Remove inline assembler; this needs to happen before
@@ -738,30 +709,6 @@ bool goto_analyzer_parse_optionst::process_goto_program(
738
709
// add loop ids
739
710
goto_model.goto_functions .compute_loop_numbers ();
740
711
}
741
-
742
- catch (const char *e)
743
- {
744
- error () << e << eom;
745
- return true ;
746
- }
747
-
748
- catch (const std::string &e)
749
- {
750
- error () << e << eom;
751
- return true ;
752
- }
753
-
754
- catch (int )
755
- {
756
- return true ;
757
- }
758
-
759
- catch (const std::bad_alloc &)
760
- {
761
- error () << " Out of memory" << eom;
762
- return true ;
763
- }
764
-
765
712
return false ;
766
713
}
767
714
Original file line number Diff line number Diff line change @@ -172,7 +172,6 @@ class goto_analyzer_parse_optionst:
172
172
virtual void get_command_line_options (optionst &options);
173
173
174
174
virtual bool process_goto_program (const optionst &options);
175
- bool set_properties ();
176
175
177
176
virtual int perform_analysis (const optionst &options);
178
177
You can’t perform that action at this time.
0 commit comments