Mercurial > hg > octave-jordi

comparison libinterp/octave.cc @ 20956:9db35d2042be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: eliminate special cases of statements after error. * daspk.cc: Eliminate DASPK_ABORT, DASPK_ABORT1, DASPK_ABORT2 macros. * dasrt.cc: Eliminate DASRT_ABORT, DASRT_ABORT1, DASRT_ABORT2 macros. * dassl.cc: Eliminate DASSL_ABORT, DASSL_ABORT1, DASSL_ABORT2 macros. libinterp/corefcn/graphics.cc (Fdrawnow): Reverse order and call gh_manager::unlock() before call to error(). * variables.cc (Fmlock): Adjust indentation. * __glpk__.cc (glpk): Add FIXME note about unreachable code. * __init_fltk__.cc (F__fltk_check__, F__init_fltk__): Place return statement within #ifdef HAVE_FLTK block. * ov-fcn-handle.cc (load_hdf5): eliminate useless statements after error. * ov-java.cc (F__java_exit__): Place return statement within #ifdef HAVE_JAVA block. * octave.cc (octave_process_command_line): Issue warning, which will return, and then call octave_print_terse_usage_and_exit. * lex.ll: Add FIXME notes about unreachable code. * oct-parse.in.yy (source_file): Eliminate useless return after error.
author Rik <rik@octave.org>
date Sun, 20 Dec 2015 15:31:53 -0800
parents 48b2ad5ee801
children 93748bcaec17
comparison
equal deleted inserted replaced
20955:850e3d2533d4 20956:9db35d2042be
707 } 707 }
708 708
709 // Check for various incompatible argument pairs 709 // Check for various incompatible argument pairs
710 if (force_gui_option && no_gui_option) 710 if (force_gui_option && no_gui_option)
711 { 711 {
712 error ("only one of --force-gui and --no-gui may be used"); 712 warning ("only one of --force-gui and --no-gui may be used");
713 713
714 octave_print_terse_usage_and_exit (); 714 octave_print_terse_usage_and_exit ();
715 } 715 }
716 716
717 bool script_file = (argc - optind) > 0; 717 bool script_file = (argc - optind) > 0;
718 if (! code_to_eval.empty () && script_file) 718 if (! code_to_eval.empty () && script_file)
719 { 719 {
720 error ("--eval \"CODE\" and script file are mutually exclusive options"); 720 warning ("--eval \"CODE\" and script file are mutually exclusive options");
721 721
722 octave_print_terse_usage_and_exit (); 722 octave_print_terse_usage_and_exit ();
723 } 723 }
724 an_octave_program = ((script_file || ! code_to_eval.empty ()) 724 an_octave_program = ((script_file || ! code_to_eval.empty ())
725 && ! persist && ! traditional); 725 && ! persist && ! traditional);