Mercurial > octave-nkf

comparison src/main-cli.cc @ 15224:a44e4a08fc55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
perform fewer actions before starting GUI * octave.cc (forced_line_editing, read_history_file, command_line_path, echo_executing_commands, doc_cache_file, exec_path, image_path, info_file, info_program, no_window_system, texi_macros_file): New file-scope static variables. (octave_process_command_line): New function. Process command line and set octave_cmdline_argc, octave_cmdline_argv, forced_line_editing, and read_history_file here, not in octave_initialize_interpreter. (octave_initialize_interpreter): Perform actions for command line options here instead of in command option processing loop in octave_process_command_line. (octave_main): Call octave_process_command_line. * octave.h (octave_process_command_line): Provide decl. * main.cc, main-cli.cc (main): Call octave_process_command_line. * main.cc (main): If not starting GUI, call octave_initialize_interpreter before calling octave_execute_interpreter. * main-cli.cc (main): Call octave_initialize_interpreter before calling octave_execute_interpreter. * octave-main-thread.cc (octave_main_thread::run): Likewise.
author John W. Eaton <jwe@octave.org>
date Thu, 23 Aug 2012 17:53:42 -0400
parents bfc220d1de67
children ad1a980b0cb5
comparison
equal deleted inserted replaced
15223:6ec6ddebb1a6 15224:a44e4a08fc55
27 #include <octave.h> 27 #include <octave.h>
28 28
29 int 29 int
30 main (int argc, char **argv) 30 main (int argc, char **argv)
31 { 31 {
32 octave_process_command_line (argc, argv);
33
32 octave_initialize_interpreter (argc, argv, 0); 34 octave_initialize_interpreter (argc, argv, 0);
33 35
34 return octave_execute_interpreter (); 36 return octave_execute_interpreter ();
35 } 37 }