Mercurial > hg > octave-lyh
annotate libinterp/interpfcn/input.cc @ 16187:490625211945
don't use new to create parser object
* topleve.cc (main_loop): Don't use new to create parser object.
Change all uses. Don't use unwind protect to clean up the parser
object.
* input.cc (get_debug_input): Likewise.
* oct-parse.in.yy (parse_fcn_file, eval_string): Likewise.
(yyerror, bison_error, %parse-param): Pass octave_parser argument by
reference, not pointer.
(#define curr_lexer): Update definition.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 04 Mar 2013 09:13:32 -0500 |
| parents | a7669b4d27f6 |
| children | b52d2f9294b6 |
| rev | line source |
|---|---|
| 1 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
13970
diff
changeset
|
3 Copyright (C) 1993-2012 John W. Eaton |
| 1 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 1 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 1 | 20 |
| 21 */ | |
| 22 | |
| 2939 | 23 // Get command input interactively or from files. |
| 1 | 24 |
| 240 | 25 #ifdef HAVE_CONFIG_H |
| 1192 | 26 #include <config.h> |
| 1 | 27 #endif |
| 28 | |
|
10463
bbe99b2a5ba7
undo recent gnulib-related changes
John W. Eaton <jwe@octave.org>
parents:
10447
diff
changeset
|
29 #include <cstdio> |
| 1343 | 30 #include <cstdlib> |
| 31 #include <cstring> | |
| 32 #include <cassert> | |
| 33 | |
| 3503 | 34 #include <iostream> |
| 5765 | 35 #include <sstream> |
| 1728 | 36 #include <string> |
| 37 | |
| 529 | 38 #include <sys/types.h> |
| 39 #include <unistd.h> | |
| 1343 | 40 |
| 2927 | 41 #include "cmd-edit.h" |
| 3189 | 42 #include "file-ops.h" |
| 4153 | 43 #include "quit.h" |
| 1755 | 44 #include "str-vec.h" |
| 45 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
46 #include "debug.h" |
| 1352 | 47 #include "defun.h" |
| 48 #include "dirfns.h" | |
| 1 | 49 #include "error.h" |
| 2181 | 50 #include "gripes.h" |
| 3016 | 51 #include "help.h" |
| 1 | 52 #include "input.h" |
|
9999
653716f3d976
get_debug_input: force interactive input mode; don't get user input unless stdin is a tty
John W. Eaton <jwe@octave.org>
parents:
9485
diff
changeset
|
53 #include "lex.h" |
| 5832 | 54 #include "load-path.h" |
| 1352 | 55 #include "oct-map.h" |
| 1742 | 56 #include "oct-hist.h" |
| 1670 | 57 #include "toplev.h" |
| 1755 | 58 #include "oct-obj.h" |
| 1 | 59 #include "pager.h" |
| 529 | 60 #include "parse.h" |
| 1352 | 61 #include "pathlen.h" |
| 3772 | 62 #include "pt.h" |
| 1755 | 63 #include "pt-const.h" |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
64 #include "pt-eval.h" |
| 3805 | 65 #include "pt-stmt.h" |
| 1352 | 66 #include "sighandlers.h" |
| 1114 | 67 #include "sysdep.h" |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7734
diff
changeset
|
68 #include "toplev.h" |
| 3098 | 69 #include "unwind-prot.h" |
| 1352 | 70 #include "utils.h" |
| 71 #include "variables.h" | |
| 529 | 72 |
| 2181 | 73 // Primary prompt string. |
| 5794 | 74 static std::string VPS1 = "\\s:\\#> "; |
| 2181 | 75 |
| 76 // Secondary prompt string. | |
| 5794 | 77 static std::string VPS2 = "> "; |
| 2181 | 78 |
| 79 // String printed before echoed input (enabled by --echo-input). | |
| 5794 | 80 std::string VPS4 = "+ "; |
| 2181 | 81 |
| 3019 | 82 // Echo commands as they are executed? |
| 83 // | |
| 84 // 1 ==> echo commands read from script files | |
| 85 // 2 ==> echo commands from functions | |
| 86 // 4 ==> echo commands read from command line | |
| 87 // | |
| 88 // more than one state can be active at once. | |
| 5794 | 89 int Vecho_executing_commands = ECHO_OFF; |
| 3019 | 90 |
| 3165 | 91 // The time we last printed a prompt. |
| 5832 | 92 octave_time Vlast_prompt_time = 0.0; |
| 3165 | 93 |
| 2181 | 94 // Character to append after successful command-line completion attempts. |
| 5794 | 95 static char Vcompletion_append_char = ' '; |
| 2181 | 96 |
| 1 | 97 // Global pointer for eval(). |
| 3523 | 98 std::string current_eval_string; |
| 1 | 99 |
| 3019 | 100 // TRUE means get input from current_eval_string. |
| 101 bool get_input_from_eval_string = false; | |
| 1 | 102 |
| 5189 | 103 // TRUE means that input is coming from a file that was named on |
| 104 // the command line. | |
| 105 bool input_from_command_line_file = false; | |
| 106 | |
|
9999
653716f3d976
get_debug_input: force interactive input mode; don't get user input unless stdin is a tty
John W. Eaton <jwe@octave.org>
parents:
9485
diff
changeset
|
107 // TRUE means that stdin is a terminal, not a pipe or redirected file. |
|
653716f3d976
get_debug_input: force interactive input mode; don't get user input unless stdin is a tty
John W. Eaton <jwe@octave.org>
parents:
9485
diff
changeset
|
108 bool stdin_is_tty = false; |
|
653716f3d976
get_debug_input: force interactive input mode; don't get user input unless stdin is a tty
John W. Eaton <jwe@octave.org>
parents:
9485
diff
changeset
|
109 |
| 3019 | 110 // TRUE means we're parsing a function file. |
| 111 bool reading_fcn_file = false; | |
| 1 | 112 |
| 9476 | 113 // TRUE means we're parsing a classdef file. |
| 114 bool reading_classdef_file = false; | |
| 115 | |
| 338 | 116 // Simple name of function file we are reading. |
| 3523 | 117 std::string curr_fcn_file_name; |
| 1606 | 118 |
| 119 // Full name of file we are reading. | |
| 3523 | 120 std::string curr_fcn_file_full_name; |
| 1 | 121 |
| 3019 | 122 // TRUE means we're parsing a script file. |
| 123 bool reading_script_file = false; | |
| 1 | 124 |
| 125 // If we are reading from an M-file, this is it. | |
| 529 | 126 FILE *ff_instream = 0; |
| 1 | 127 |
| 3019 | 128 // TRUE means this is an interactive shell. |
| 129 bool interactive = false; | |
| 1 | 130 |
| 3019 | 131 // TRUE means the user forced this shell to be interactive (-i). |
| 132 bool forced_interactive = false; | |
| 1 | 133 |
| 134 // Should we issue a prompt? | |
| 135 int promptflag = 1; | |
| 136 | |
| 137 // The current line of input, from wherever. | |
| 3523 | 138 std::string current_input_line; |
| 1 | 139 |
| 3804 | 140 // TRUE after a call to completion_matches. |
| 2299 | 141 bool octave_completion_matches_called = false; |
| 142 | |
| 6257 | 143 // TRUE if the plotting system has requested a call to drawnow at |
| 144 // the next user prompt. | |
| 7409 | 145 bool Vdrawnow_requested = false; |
| 6257 | 146 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7734
diff
changeset
|
147 // TRUE if we are in debugging mode. |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7734
diff
changeset
|
148 bool Vdebugging = false; |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7734
diff
changeset
|
149 |
|
8841
c74389115610
auto repeat for debugging commands
John W. Eaton <jwe@octave.org>
parents:
8749
diff
changeset
|
150 // If we are in debugging mode, this is the last command entered, so |
|
c74389115610
auto repeat for debugging commands
John W. Eaton <jwe@octave.org>
parents:
8749
diff
changeset
|
151 // that we can repeat the previous command if the user just types RET. |
|
c74389115610
auto repeat for debugging commands
John W. Eaton <jwe@octave.org>
parents:
8749
diff
changeset
|
152 static std::string last_debugging_command; |
|
c74389115610
auto repeat for debugging commands
John W. Eaton <jwe@octave.org>
parents:
8749
diff
changeset
|
153 |
| 7294 | 154 // TRUE if we are running in the Emacs GUD mode. |
| 155 static bool Vgud_mode = false; | |
| 156 | |
|
7818
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
157 // The filemarker used to separate filenames from subfunction names |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
158 char Vfilemarker = '>'; |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
159 |
| 1044 | 160 static void |
| 3523 | 161 do_input_echo (const std::string& input_string) |
| 1044 | 162 { |
| 1588 | 163 int do_echo = reading_script_file ? |
| 2205 | 164 (Vecho_executing_commands & ECHO_SCRIPTS) |
| 2618 | 165 : (Vecho_executing_commands & ECHO_CMD_LINE) && ! forced_interactive; |
| 1588 | 166 |
| 167 if (do_echo) | |
| 1044 | 168 { |
| 1403 | 169 if (forced_interactive) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
170 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
171 if (promptflag > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
172 octave_stdout << command_editor::decode_prompt_string (VPS1); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
173 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
174 octave_stdout << command_editor::decode_prompt_string (VPS2); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
175 } |
| 1403 | 176 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
177 octave_stdout << command_editor::decode_prompt_string (VPS4); |
| 1044 | 178 |
| 1755 | 179 if (! input_string.empty ()) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
180 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
181 octave_stdout << input_string; |
| 1755 | 182 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
183 if (input_string[input_string.length () - 1] != '\n') |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
184 octave_stdout << "\n"; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
185 } |
| 1044 | 186 } |
| 187 } | |
| 188 | |
| 3536 | 189 std::string |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
190 gnu_readline (const std::string& s, bool& eof, bool force_readline) |
| 1822 | 191 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
10066
diff
changeset
|
192 octave_quit (); |
| 5142 | 193 |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
194 eof = false; |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
195 |
| 3523 | 196 std::string retval; |
| 1822 | 197 |
| 2927 | 198 if (line_editing || force_readline) |
| 1822 | 199 { |
| 3219 | 200 retval = command_editor::readline (s, eof); |
| 201 | |
| 202 if (! eof && retval.empty ()) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
203 retval = "\n"; |
| 1822 | 204 } |
| 205 else | |
| 206 { | |
| 2927 | 207 if (! s.empty () && (interactive || forced_interactive)) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
208 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
209 FILE *stream = command_editor::get_output_stream (); |
| 2927 | 210 |
| 10411 | 211 gnulib::fputs (s.c_str (), stream); |
|
12912
e116dd862879
use gnulib:: qualifiers for more stdio functions
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
212 gnulib::fflush (stream); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
213 } |
| 1822 | 214 |
| 2927 | 215 FILE *curr_stream = command_editor::get_input_stream (); |
| 216 | |
| 9476 | 217 if (reading_fcn_file || reading_script_file || reading_classdef_file) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
218 curr_stream = ff_instream; |
| 1822 | 219 |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
220 retval = octave_fgets (curr_stream, eof); |
| 1822 | 221 } |
| 222 | |
| 223 return retval; | |
| 224 } | |
| 581 | 225 |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
226 extern std::string |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
227 gnu_readline (const std::string& s, bool force_readline) |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
228 { |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
229 bool eof = false; |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
230 |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
231 return gnu_readline (s, eof, force_readline); |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
232 } |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
233 |
| 6257 | 234 static inline std::string |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
235 interactive_input (const std::string& s, bool& eof, bool force_readline) |
| 6257 | 236 { |
| 237 Vlast_prompt_time.stamp (); | |
| 238 | |
|
7459
d3fe4d466bc2
don't inhibit drawnow in debug mode
John W. Eaton <jwe@octave.org>
parents:
7409
diff
changeset
|
239 if (Vdrawnow_requested && (interactive || forced_interactive)) |
| 6257 | 240 { |
| 241 feval ("drawnow"); | |
| 242 | |
| 6367 | 243 flush_octave_stdout (); |
| 244 | |
| 6305 | 245 // We set Vdrawnow_requested to false even if there is an error |
| 246 // in drawnow so that the error doesn't reappear at every prompt. | |
| 247 | |
| 6257 | 248 Vdrawnow_requested = false; |
| 6305 | 249 |
| 250 if (error_state) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
251 return "\n"; |
| 6257 | 252 } |
| 253 | |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
254 return gnu_readline (s, eof, force_readline); |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
255 } |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
256 |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
257 static inline std::string |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
258 interactive_input (const std::string& s, bool force_readline = false) |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
259 { |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
260 bool eof = false; |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
261 |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
262 return interactive_input (s, eof, force_readline); |
| 6257 | 263 } |
| 264 | |
| 3536 | 265 static std::string |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
266 octave_gets (bool& eof) |
| 1 | 267 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
10066
diff
changeset
|
268 octave_quit (); |
| 5142 | 269 |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
270 eof = false; |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
271 |
| 3523 | 272 std::string retval; |
| 1 | 273 |
|
8841
c74389115610
auto repeat for debugging commands
John W. Eaton <jwe@octave.org>
parents:
8749
diff
changeset
|
274 bool history_skip_auto_repeated_debugging_command = false; |
|
c74389115610
auto repeat for debugging commands
John W. Eaton <jwe@octave.org>
parents:
8749
diff
changeset
|
275 |
| 1822 | 276 if ((interactive || forced_interactive) |
| 5832 | 277 && (! (reading_fcn_file |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
278 || reading_classdef_file |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
279 || reading_script_file |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
280 || get_input_from_eval_string |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
281 || input_from_startup_file |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
282 || input_from_command_line_file))) |
| 1 | 283 { |
| 5794 | 284 std::string ps = (promptflag > 0) ? VPS1 : VPS2; |
| 1755 | 285 |
| 3523 | 286 std::string prompt = command_editor::decode_prompt_string (ps); |
| 1 | 287 |
| 2618 | 288 pipe_handler_error_count = 0; |
| 289 | |
| 290 flush_octave_stdout (); | |
| 1 | 291 |
|
13266
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
12989
diff
changeset
|
292 octave_pager_stream::reset (); |
|
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
12989
diff
changeset
|
293 octave_diary_stream::reset (); |
|
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
12989
diff
changeset
|
294 |
| 2095 | 295 octave_diary << prompt; |
| 581 | 296 |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
297 retval = interactive_input (prompt, eof, false); |
| 5832 | 298 |
| 299 // There is no need to update the load_path cache if there is no | |
| 300 // user input. | |
|
8019
0ef13e15319b
replace NPOS with std::string::npos
John W. Eaton <jwe@octave.org>
parents:
7913
diff
changeset
|
301 if (! retval.empty () |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
302 && retval.find_first_not_of (" \t\n\r") != std::string::npos) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
303 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
304 load_path::update (); |
|
8841
c74389115610
auto repeat for debugging commands
John W. Eaton <jwe@octave.org>
parents:
8749
diff
changeset
|
305 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
306 if (Vdebugging) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
307 last_debugging_command = retval; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
308 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
309 last_debugging_command = std::string (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
310 } |
|
8841
c74389115610
auto repeat for debugging commands
John W. Eaton <jwe@octave.org>
parents:
8749
diff
changeset
|
311 else if (Vdebugging) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
312 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
313 retval = last_debugging_command; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
314 history_skip_auto_repeated_debugging_command = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
315 } |
| 1 | 316 } |
| 317 else | |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
318 retval = gnu_readline ("", eof, false); |
| 1 | 319 |
| 2927 | 320 current_input_line = retval; |
| 1 | 321 |
| 1822 | 322 if (! current_input_line.empty ()) |
| 1 | 323 { |
|
8841
c74389115610
auto repeat for debugging commands
John W. Eaton <jwe@octave.org>
parents:
8749
diff
changeset
|
324 if (! (input_from_startup_file || input_from_command_line_file |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
325 || history_skip_auto_repeated_debugging_command)) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
326 command_history::add (current_input_line); |
| 1 | 327 |
| 9476 | 328 if (! (reading_fcn_file || reading_script_file || reading_classdef_file)) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
329 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
330 octave_diary << current_input_line; |
| 3176 | 331 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
332 if (current_input_line[current_input_line.length () - 1] != '\n') |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
333 octave_diary << "\n"; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
334 } |
| 581 | 335 |
| 1822 | 336 do_input_echo (current_input_line); |
| 1 | 337 } |
| 9476 | 338 else if (! (reading_fcn_file || reading_script_file || reading_classdef_file)) |
| 3176 | 339 octave_diary << "\n"; |
| 9476 | 340 |
| 1822 | 341 return retval; |
| 1 | 342 } |
| 343 | |
| 581 | 344 // Read a line from the input stream. |
| 345 | |
|
16098
24b3800d30e7
move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents:
16097
diff
changeset
|
346 std::string |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
347 get_user_input (bool& eof) |
| 1 | 348 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
10066
diff
changeset
|
349 octave_quit (); |
| 5142 | 350 |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
351 eof = false; |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
352 |
| 3523 | 353 std::string retval; |
| 1 | 354 |
| 355 if (get_input_from_eval_string) | |
| 356 { | |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
357 retval = current_eval_string; |
| 3877 | 358 |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
359 // Clear the global eval string so that the next call will return |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
360 // an empty character string with EOF = true. |
|
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
361 current_eval_string = ""; |
| 1822 | 362 |
|
16165
fbc8f7afb193
* input.cc (get_user_input): Only return eof if retval is empty.
John W. Eaton <jwe@octave.org>
parents:
16163
diff
changeset
|
363 if (retval.empty ()) |
|
fbc8f7afb193
* input.cc (get_user_input): Only return eof if retval is empty.
John W. Eaton <jwe@octave.org>
parents:
16163
diff
changeset
|
364 eof = true; |
| 1822 | 365 } |
| 366 else | |
|
16097
2f4fa62089b3
improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents:
16053
diff
changeset
|
367 retval = octave_gets (eof); |
| 1822 | 368 |
| 2927 | 369 current_input_line = retval; |
| 1822 | 370 |
| 371 return retval; | |
| 372 } | |
| 373 | |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14880
diff
changeset
|
374 // Fix things up so that input can come from file 'name', printing a |
| 581 | 375 // warning if the file doesn't exist. |
| 376 | |
| 1 | 377 FILE * |
| 3523 | 378 get_input_from_file (const std::string& name, int warn) |
| 1 | 379 { |
| 529 | 380 FILE *instream = 0; |
| 1 | 381 |
| 1750 | 382 if (name.length () > 0) |
|
12941
9a498efac5f1
use gnulib::fseek and gnulib::fopen
John W. Eaton <jwe@octave.org>
parents:
12912
diff
changeset
|
383 instream = gnulib::fopen (name.c_str (), "rb"); |
| 1 | 384 |
| 529 | 385 if (! instream && warn) |
| 1750 | 386 warning ("%s: no such file or directory", name.c_str ()); |
| 1 | 387 |
| 9476 | 388 if (reading_fcn_file || reading_script_file || reading_classdef_file) |
| 339 | 389 ff_instream = instream; |
| 1 | 390 else |
| 2927 | 391 command_editor::set_input_stream (instream); |
| 1 | 392 |
| 393 return instream; | |
| 394 } | |
| 395 | |
| 581 | 396 // Fix things up so that input can come from the standard input. This |
| 397 // may need to become much more complicated, which is why it's in a | |
| 398 // separate function. | |
| 399 | |
| 1 | 400 FILE * |
| 401 get_input_from_stdin (void) | |
| 402 { | |
| 2927 | 403 command_editor::set_input_stream (stdin); |
| 404 return command_editor::get_input_stream (); | |
| 1 | 405 } |
| 406 | |
| 5775 | 407 // FIXME -- make this generate file names when appropriate. |
| 2921 | 408 |
| 2247 | 409 static string_vector |
| 3523 | 410 generate_possible_completions (const std::string& text, std::string& prefix, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
411 std::string& hint) |
| 1280 | 412 { |
| 2247 | 413 string_vector names; |
| 1280 | 414 |
| 2921 | 415 prefix = ""; |
| 1280 | 416 |
| 4604 | 417 if (looks_like_struct (text)) |
| 1430 | 418 names = generate_struct_completions (text, prefix, hint); |
| 419 else | |
| 2247 | 420 names = make_name_list (); |
| 1280 | 421 |
| 2944 | 422 // Sort and remove duplicates. |
| 2348 | 423 |
|
8503
8ba2ee57c594
remove qsort in favor of sort
Jaroslav Hajek <highegg@gmail.com>
parents:
8447
diff
changeset
|
424 names.sort (true); |
| 2348 | 425 |
| 1280 | 426 return names; |
| 427 } | |
| 428 | |
|
9485
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
429 static bool |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
430 is_completing_dirfns (void) |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
431 { |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
432 static std::string dirfns_commands[] = {"cd", "ls"}; |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
433 static const size_t dirfns_commands_length = 2; |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
434 |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
435 bool retval = false; |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
436 |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
437 std::string line = command_editor::get_line_buffer (); |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
438 |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
439 for (size_t i = 0; i < dirfns_commands_length; i++) |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
440 { |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
441 int index = line.find (dirfns_commands[i] + " "); |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
442 |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
443 if (index == 0) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
444 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
445 retval = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
446 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
447 } |
|
9485
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
448 } |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
449 |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
450 return retval; |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
451 } |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
452 |
| 3536 | 453 static std::string |
| 3523 | 454 generate_completion (const std::string& text, int state) |
| 1280 | 455 { |
| 3523 | 456 std::string retval; |
| 2944 | 457 |
| 3523 | 458 static std::string prefix; |
| 459 static std::string hint; | |
| 1280 | 460 |
| 2921 | 461 static size_t hint_len = 0; |
| 1280 | 462 |
| 1 | 463 static int list_index = 0; |
| 2921 | 464 static int name_list_len = 0; |
| 4604 | 465 static int name_list_total_len = 0; |
| 2247 | 466 static string_vector name_list; |
| 4604 | 467 static string_vector file_name_list; |
| 1 | 468 |
| 1280 | 469 static int matches = 0; |
| 1 | 470 |
| 471 if (state == 0) | |
| 472 { | |
| 473 list_index = 0; | |
| 474 | |
| 2921 | 475 prefix = ""; |
| 1280 | 476 |
| 2921 | 477 hint = text; |
| 1280 | 478 |
|
9485
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
479 // No reason to display symbols while completing a |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
480 // file/directory operation. |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
481 |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
482 if (is_completing_dirfns ()) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
483 name_list = string_vector (); |
|
9485
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
484 else |
|
3cee58bf4acf
selectively complete filenames in some cases
John W. Eaton <jwe@octave.org>
parents:
9484
diff
changeset
|
485 name_list = generate_possible_completions (text, prefix, hint); |
| 1280 | 486 |
| 2921 | 487 name_list_len = name_list.length (); |
| 488 | |
| 4604 | 489 file_name_list = command_editor::generate_filename_completions (text); |
| 490 | |
| 491 name_list.append (file_name_list); | |
| 492 | |
| 493 name_list_total_len = name_list.length (); | |
| 494 | |
| 2921 | 495 hint_len = hint.length (); |
| 1280 | 496 |
| 497 matches = 0; | |
| 2247 | 498 |
| 2921 | 499 for (int i = 0; i < name_list_len; i++) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
500 if (hint == name_list[i].substr (0, hint_len)) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
501 matches++; |
| 1 | 502 } |
| 503 | |
| 4604 | 504 if (name_list_total_len > 0 && matches > 0) |
| 1 | 505 { |
| 4604 | 506 while (list_index < name_list_total_len) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
507 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
508 std::string name = name_list[list_index]; |
| 2247 | 509 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
510 list_index++; |
| 2247 | 511 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
512 if (hint == name.substr (0, hint_len)) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
513 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
514 if (list_index <= name_list_len && ! prefix.empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
515 retval = prefix + "." + name; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
516 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
517 retval = name; |
| 1280 | 518 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
519 // FIXME -- looks_like_struct is broken for now, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
520 // so it always returns false. |
| 4179 | 521 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
522 if (matches == 1 && looks_like_struct (retval)) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
523 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
524 // Don't append anything, since we don't know |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
525 // whether it should be '(' or '.'. |
| 4179 | 526 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
527 command_editor::set_completion_append_character ('\0'); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
528 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
529 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
530 command_editor::set_completion_append_character |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
531 (Vcompletion_append_char); |
| 1280 | 532 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
533 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
534 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
535 } |
| 1 | 536 } |
| 537 | |
| 2944 | 538 return retval; |
| 1 | 539 } |
| 540 | |
| 6979 | 541 static std::string |
| 542 quoting_filename (const std::string &text, int, char quote) | |
| 543 { | |
| 544 if (quote) | |
| 545 return text; | |
| 546 else | |
| 547 return (std::string ("'") + text); | |
| 548 } | |
| 549 | |
| 2927 | 550 void |
| 551 initialize_command_input (void) | |
| 552 { | |
| 553 // If we are using readline, this allows conditional parsing of the | |
| 554 // .inputrc file. | |
| 269 | 555 |
| 2927 | 556 command_editor::set_name ("Octave"); |
| 1358 | 557 |
| 5775 | 558 // FIXME -- this needs to include a comma too, but that |
| 3933 | 559 // causes trouble for the new struct element completion code. |
| 560 | |
| 4272 | 561 static const char *s = "\t\n !\"\'*+-/:;<=>(){}[\\]^`~"; |
| 3933 | 562 |
| 563 command_editor::set_basic_word_break_characters (s); | |
| 564 | |
| 565 command_editor::set_completer_word_break_characters (s); | |
| 566 | |
| 3004 | 567 command_editor::set_basic_quote_characters ("\""); |
| 2944 | 568 |
| 6979 | 569 command_editor::set_filename_quote_characters (" \t\n\\\"'@<>=;|&()#$`?*[!:{"); |
| 570 command_editor::set_completer_quote_characters ("'\""); | |
| 571 | |
| 2944 | 572 command_editor::set_completion_function (generate_completion); |
| 6979 | 573 |
| 574 command_editor::set_quoting_function (quoting_filename); | |
| 269 | 575 } |
| 576 | |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
577 static void |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
578 get_debug_input (const std::string& prompt) |
| 269 | 579 { |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
580 octave_user_code *caller = octave_call_stack::caller_user_code (); |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
581 std::string nm; |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
582 |
|
9484
bbe033dcfe13
make dbwhere work when called at keyboard prompt
John W. Eaton <jwe@octave.org>
parents:
9483
diff
changeset
|
583 int curr_debug_line = octave_call_stack::current_line (); |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
584 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
585 bool have_file = false; |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
586 |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
587 if (caller) |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
588 { |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
589 nm = caller->fcn_file_name (); |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
590 |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
591 if (nm.empty ()) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
592 nm = caller->name (); |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
593 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
594 have_file = true; |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
595 } |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
596 else |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
597 curr_debug_line = -1; |
| 3180 | 598 |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
599 std::ostringstream buf; |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
600 |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
601 if (! nm.empty ()) |
| 3180 | 602 { |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
603 if (Vgud_mode) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
604 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
605 static char ctrl_z = 'Z' & 0x1f; |
| 269 | 606 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
607 buf << ctrl_z << ctrl_z << nm << ":" << curr_debug_line; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
608 } |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
609 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
610 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
611 // FIXME -- we should come up with a clean way to detect |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
612 // that we are stopped on the no-op command that marks the |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
613 // end of a function or script. |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
614 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
615 buf << "stopped in " << nm; |
| 1 | 616 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
617 if (curr_debug_line > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
618 buf << " at line " << curr_debug_line; |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
619 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
620 if (have_file) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
621 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
622 std::string line_buf |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
623 = get_file_line (nm, curr_debug_line); |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
624 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
625 if (! line_buf.empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
626 buf << "\n" << curr_debug_line << ": " << line_buf; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
627 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
628 } |
| 3180 | 629 } |
| 630 | |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
631 std::string msg = buf.str (); |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
632 |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
633 if (! msg.empty ()) |
|
9484
bbe033dcfe13
make dbwhere work when called at keyboard prompt
John W. Eaton <jwe@octave.org>
parents:
9483
diff
changeset
|
634 std::cerr << msg << std::endl; |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
635 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9999
diff
changeset
|
636 unwind_protect frame; |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
637 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9999
diff
changeset
|
638 frame.protect_var (VPS1); |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
639 VPS1 = prompt; |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
640 |
|
12907
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
641 if (! (interactive || forced_interactive) |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
642 || (reading_fcn_file |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
643 || reading_classdef_file |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
644 || reading_script_file |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
645 || get_input_from_eval_string |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
646 || input_from_startup_file |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
647 || input_from_command_line_file)) |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
648 { |
|
12907
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
649 frame.protect_var (forced_interactive); |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
650 forced_interactive = true; |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
651 |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
652 frame.protect_var (reading_fcn_file); |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
653 reading_fcn_file = false; |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
654 |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
655 frame.protect_var (reading_classdef_file); |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
656 reading_classdef_file = false; |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
657 |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
658 frame.protect_var (reading_script_file); |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
659 reading_script_file = false; |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
660 |
|
12907
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
661 frame.protect_var (input_from_startup_file); |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
662 input_from_startup_file = false; |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
663 |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
664 frame.protect_var (input_from_command_line_file); |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
665 input_from_command_line_file = false; |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
666 |
|
12907
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
667 frame.protect_var (get_input_from_eval_string); |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
668 get_input_from_eval_string = false; |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
669 } |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
670 |
| 16151 | 671 // octave_parser constructor sets this for us. |
| 672 frame.protect_var (CURR_LEXER); | |
| 673 | |
|
16187
490625211945
don't use new to create parser object
John W. Eaton <jwe@octave.org>
parents:
16177
diff
changeset
|
674 octave_parser curr_parser; |
| 16151 | 675 |
|
12907
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
676 while (Vdebugging) |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
677 { |
|
16127
f7eb13f14320
avoid using unwind_protect::run
John W. Eaton <jwe@octave.org>
parents:
16122
diff
changeset
|
678 unwind_protect middle_frame; |
|
f7eb13f14320
avoid using unwind_protect::run
John W. Eaton <jwe@octave.org>
parents:
16122
diff
changeset
|
679 |
|
12907
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
680 reset_error_handler (); |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
681 |
|
16187
490625211945
don't use new to create parser object
John W. Eaton <jwe@octave.org>
parents:
16177
diff
changeset
|
682 curr_parser.reset (); |
|
9999
653716f3d976
get_debug_input: force interactive input mode; don't get user input unless stdin is a tty
John W. Eaton <jwe@octave.org>
parents:
9485
diff
changeset
|
683 |
|
12907
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
684 // Do this with an unwind-protect cleanup function so that the |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
685 // forced variables will be unmarked in the event of an interrupt. |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
686 symbol_table::scope_id scope = symbol_table::top_scope (); |
|
16127
f7eb13f14320
avoid using unwind_protect::run
John W. Eaton <jwe@octave.org>
parents:
16122
diff
changeset
|
687 middle_frame.add_fcn (symbol_table::unmark_forced_variables, scope); |
|
9260
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9215
diff
changeset
|
688 |
|
16187
490625211945
don't use new to create parser object
John W. Eaton <jwe@octave.org>
parents:
16177
diff
changeset
|
689 int retval = curr_parser.run (); |
|
9999
653716f3d976
get_debug_input: force interactive input mode; don't get user input unless stdin is a tty
John W. Eaton <jwe@octave.org>
parents:
9485
diff
changeset
|
690 |
|
16187
490625211945
don't use new to create parser object
John W. Eaton <jwe@octave.org>
parents:
16177
diff
changeset
|
691 if (retval == 0 && curr_parser.stmt_list) |
|
12907
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
692 { |
|
16187
490625211945
don't use new to create parser object
John W. Eaton <jwe@octave.org>
parents:
16177
diff
changeset
|
693 curr_parser.stmt_list->accept (*current_evaluator); |
|
9999
653716f3d976
get_debug_input: force interactive input mode; don't get user input unless stdin is a tty
John W. Eaton <jwe@octave.org>
parents:
9485
diff
changeset
|
694 |
|
12907
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
695 if (octave_completion_matches_called) |
|
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
696 octave_completion_matches_called = false; |
|
9999
653716f3d976
get_debug_input: force interactive input mode; don't get user input unless stdin is a tty
John W. Eaton <jwe@octave.org>
parents:
9485
diff
changeset
|
697 } |
|
7913
f46e73bcb85b
toplev.cc (main_loop): undo previous change; input.cc (get_debug_input): don't delete global_command here
John W. Eaton <jwe@octave.org>
parents:
7903
diff
changeset
|
698 |
|
12907
6e1b9f079e0f
allow debugging when input is not coming from a tty
John W. Eaton <jwe@octave.org>
parents:
12573
diff
changeset
|
699 octave_quit (); |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
700 } |
| 529 | 701 } |
| 702 | |
| 581 | 703 // If the user simply hits return, this will produce an empty matrix. |
| 704 | |
| 2086 | 705 static octave_value_list |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7734
diff
changeset
|
706 get_user_input (const octave_value_list& args, int nargout) |
| 529 | 707 { |
| 3100 | 708 octave_value_list retval; |
| 529 | 709 |
| 710 int nargin = args.length (); | |
| 711 | |
| 712 int read_as_string = 0; | |
| 713 | |
| 712 | 714 if (nargin == 2) |
| 529 | 715 read_as_string++; |
| 716 | |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
717 std::string prompt = args(0).string_value (); |
| 4975 | 718 |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
719 if (error_state) |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
720 { |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
721 error ("input: unrecognized argument"); |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
722 return retval; |
| 4975 | 723 } |
| 724 | |
| 2095 | 725 flush_octave_stdout (); |
| 529 | 726 |
|
13266
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
12989
diff
changeset
|
727 octave_pager_stream::reset (); |
|
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
12989
diff
changeset
|
728 octave_diary_stream::reset (); |
|
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
12989
diff
changeset
|
729 |
| 4565 | 730 octave_diary << prompt; |
| 731 | |
|
7459
d3fe4d466bc2
don't inhibit drawnow in debug mode
John W. Eaton <jwe@octave.org>
parents:
7409
diff
changeset
|
732 std::string input_buf = interactive_input (prompt.c_str (), true); |
| 529 | 733 |
|
7459
d3fe4d466bc2
don't inhibit drawnow in debug mode
John W. Eaton <jwe@octave.org>
parents:
7409
diff
changeset
|
734 if (! (error_state || input_buf.empty ())) |
| 529 | 735 { |
| 1799 | 736 if (! input_from_startup_file) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
737 command_history::add (input_buf); |
| 529 | 738 |
| 2927 | 739 size_t len = input_buf.length (); |
| 529 | 740 |
| 4565 | 741 octave_diary << input_buf; |
| 742 | |
| 743 if (input_buf[len - 1] != '\n') | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
744 octave_diary << "\n"; |
| 4565 | 745 |
| 529 | 746 if (len < 1) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
747 return read_as_string ? octave_value ("") : octave_value (Matrix ()); |
| 3772 | 748 |
| 749 if (read_as_string) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
750 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
751 // FIXME -- fix gnu_readline and octave_gets instead! |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
752 if (input_buf.length () == 1 && input_buf[0] == '\n') |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
753 retval(0) = ""; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
754 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
755 retval(0) = input_buf; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
756 } |
| 529 | 757 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
758 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
759 int parse_status = 0; |
| 2900 | 760 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
761 retval = eval_string (input_buf, true, parse_status, nargout); |
| 3100 | 762 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
763 if (! Vdebugging && retval.length () == 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
764 retval(0) = Matrix (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
765 } |
| 529 | 766 } |
| 767 else | |
| 768 error ("input: reading user-input failed!"); | |
| 769 | |
| 770 return retval; | |
| 771 } | |
| 772 | |
| 3100 | 773 DEFUN (input, args, nargout, |
| 3372 | 774 "-*- texinfo -*-\n\ |
|
16053
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
775 @deftypefn {Built-in Function} {@var{ans} =} input (@var{prompt})\n\ |
|
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
776 @deftypefnx {Built-in Function} {@var{ans} =} input (@var{prompt}, \"s\")\n\ |
| 3372 | 777 Print a prompt and wait for user input. For example,\n\ |
| 778 \n\ | |
| 779 @example\n\ | |
| 780 input (\"Pick a number, any number! \")\n\ | |
| 781 @end example\n\ | |
| 782 \n\ | |
| 783 @noindent\n\ | |
| 784 prints the prompt\n\ | |
| 785 \n\ | |
| 786 @example\n\ | |
| 787 Pick a number, any number!\n\ | |
| 788 @end example\n\ | |
| 529 | 789 \n\ |
| 3372 | 790 @noindent\n\ |
| 791 and waits for the user to enter a value. The string entered by the user\n\ | |
| 792 is evaluated as an expression, so it may be a literal constant, a\n\ | |
| 793 variable name, or any other valid expression.\n\ | |
| 794 \n\ | |
| 795 Currently, @code{input} only returns one value, regardless of the number\n\ | |
| 796 of values produced by the evaluation of the expression.\n\ | |
| 797 \n\ | |
| 798 If you are only interested in getting a literal string value, you can\n\ | |
| 799 call @code{input} with the character string @code{\"s\"} as the second\n\ | |
| 800 argument. This tells Octave to return the string entered by the user\n\ | |
| 801 directly, without evaluating it first.\n\ | |
| 802 \n\ | |
| 803 Because there may be output waiting to be displayed by the pager, it is\n\ | |
| 804 a good idea to always call @code{fflush (stdout)} before calling\n\ | |
| 805 @code{input}. This will ensure that all pending output is written to\n\ | |
|
16053
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
806 the screen before your prompt.\n\ |
|
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
807 @seealso{yes_or_no, kbhit}\n\ |
| 3372 | 808 @end deftypefn") |
| 529 | 809 { |
| 2086 | 810 octave_value_list retval; |
| 529 | 811 |
| 812 int nargin = args.length (); | |
| 813 | |
| 712 | 814 if (nargin == 1 || nargin == 2) |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7734
diff
changeset
|
815 retval = get_user_input (args, nargout); |
| 529 | 816 else |
| 5823 | 817 print_usage (); |
| 529 | 818 |
| 819 return retval; | |
| 820 } | |
| 821 | |
| 5640 | 822 bool |
| 823 octave_yes_or_no (const std::string& prompt) | |
| 824 { | |
| 825 std::string prompt_string = prompt + "(yes or no) "; | |
| 826 | |
| 827 while (1) | |
| 828 { | |
|
7459
d3fe4d466bc2
don't inhibit drawnow in debug mode
John W. Eaton <jwe@octave.org>
parents:
7409
diff
changeset
|
829 std::string input_buf = interactive_input (prompt_string, true); |
| 5640 | 830 |
| 831 if (input_buf == "yes") | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
832 return true; |
| 5640 | 833 else if (input_buf == "no") |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
834 return false; |
| 5640 | 835 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
836 message (0, "Please answer yes or no."); |
| 5640 | 837 } |
| 838 } | |
| 839 | |
| 840 DEFUN (yes_or_no, args, , | |
| 841 "-*- texinfo -*-\n\ | |
|
16053
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
842 @deftypefn {Built-in Function} {@var{ans} =} yes_or_no (\"@var{prompt}\")\n\ |
|
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
843 Ask the user a yes-or-no question. Return logical true if the answer is yes\n\ |
|
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
844 or false if the answer is no. Takes one argument, @var{prompt}, which is\n\ |
|
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
845 the string to display when asking the question. @var{prompt} should end in\n\ |
|
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
846 a space; @code{yes-or-no} adds the string @samp{(yes or no) } to it. The\n\ |
|
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
847 user must confirm the answer with @key{RET} and can edit it until it has\n\ |
|
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
848 been confirmed.\n\ |
|
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
849 @seealso{input}\n\ |
| 5640 | 850 @end deftypefn") |
| 851 { | |
| 852 octave_value retval; | |
| 853 | |
| 854 int nargin = args.length (); | |
| 855 | |
| 856 if (nargin == 0 || nargin == 1) | |
| 857 { | |
| 858 std::string prompt; | |
| 859 | |
| 860 if (nargin == 1) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
861 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
862 prompt = args(0).string_value (); |
| 5640 | 863 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
864 if (error_state) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
865 { |
|
12483
7a5aacf65f81
Rewrite error strings in src/ to use variables named in documentation.
Rik <octave@nomad.inbox5.com>
parents:
12211
diff
changeset
|
866 error ("yes_or_no: PROMPT must be a character string"); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
867 return retval; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
868 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
869 } |
| 5640 | 870 |
| 871 retval = octave_yes_or_no (prompt); | |
| 872 } | |
| 873 else | |
| 5823 | 874 print_usage (); |
| 5640 | 875 |
| 876 return retval; | |
| 877 } | |
| 878 | |
| 3707 | 879 octave_value |
| 880 do_keyboard (const octave_value_list& args) | |
| 881 { | |
| 882 octave_value retval; | |
| 883 | |
| 884 int nargin = args.length (); | |
| 885 | |
| 886 assert (nargin == 0 || nargin == 1); | |
| 887 | |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9999
diff
changeset
|
888 unwind_protect frame; |
| 3707 | 889 |
|
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12942
diff
changeset
|
890 frame.add_fcn (command_history::ignore_entries, |
|
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12942
diff
changeset
|
891 command_history::ignoring_entries ()); |
|
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12942
diff
changeset
|
892 |
| 3707 | 893 command_history::ignore_entries (false); |
| 894 | |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9999
diff
changeset
|
895 frame.protect_var (Vdebugging); |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7734
diff
changeset
|
896 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11575
diff
changeset
|
897 frame.add_fcn (octave_call_stack::restore_frame, |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9999
diff
changeset
|
898 octave_call_stack::current_frame ()); |
| 3707 | 899 |
|
9484
bbe033dcfe13
make dbwhere work when called at keyboard prompt
John W. Eaton <jwe@octave.org>
parents:
9483
diff
changeset
|
900 // FIXME -- probably we just want to print one line, not the |
|
bbe033dcfe13
make dbwhere work when called at keyboard prompt
John W. Eaton <jwe@octave.org>
parents:
9483
diff
changeset
|
901 // entire statement, which might span many lines... |
|
bbe033dcfe13
make dbwhere work when called at keyboard prompt
John W. Eaton <jwe@octave.org>
parents:
9483
diff
changeset
|
902 // |
|
bbe033dcfe13
make dbwhere work when called at keyboard prompt
John W. Eaton <jwe@octave.org>
parents:
9483
diff
changeset
|
903 // tree_print_code tpc (octave_stdout); |
|
bbe033dcfe13
make dbwhere work when called at keyboard prompt
John W. Eaton <jwe@octave.org>
parents:
9483
diff
changeset
|
904 // stmt.accept (tpc); |
|
bbe033dcfe13
make dbwhere work when called at keyboard prompt
John W. Eaton <jwe@octave.org>
parents:
9483
diff
changeset
|
905 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7734
diff
changeset
|
906 Vdebugging = true; |
| 3707 | 907 |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
908 std::string prompt = "debug> "; |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
909 if (nargin > 0) |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
910 prompt = args(0).string_value (); |
| 4233 | 911 |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
912 if (! error_state) |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7758
diff
changeset
|
913 get_debug_input (prompt); |
| 3707 | 914 |
| 915 return retval; | |
| 916 } | |
| 917 | |
| 1957 | 918 DEFUN (keyboard, args, , |
| 3372 | 919 "-*- texinfo -*-\n\ |
|
9300
fddb9f9f724b
Correct documentation for keyboard function
Rik <rdrider0-list@yahoo.com>
parents:
9260
diff
changeset
|
920 @deftypefn {Built-in Function} {} keyboard ()\n\ |
|
16053
119ce9f5e1a3
doc: Add seealso links between input, yes_or_no, kbhit.
Rik <rik@octave.org>
parents:
15469
diff
changeset
|
921 @deftypefnx {Built-in Function} {} keyboard (\"@var{prompt}\")\n\ |
| 3372 | 922 This function is normally used for simple debugging. When the\n\ |
| 923 @code{keyboard} function is executed, Octave prints a prompt and waits\n\ | |
| 924 for user input. The input strings are then evaluated and the results\n\ | |
| 925 are printed. This makes it possible to examine the values of variables\n\ | |
|
9300
fddb9f9f724b
Correct documentation for keyboard function
Rik <rdrider0-list@yahoo.com>
parents:
9260
diff
changeset
|
926 within a function, and to assign new values if necessary. To leave the\n\ |
|
fddb9f9f724b
Correct documentation for keyboard function
Rik <rdrider0-list@yahoo.com>
parents:
9260
diff
changeset
|
927 prompt and return to normal execution type @samp{return} or @samp{dbcont}.\n\ |
|
fddb9f9f724b
Correct documentation for keyboard function
Rik <rdrider0-list@yahoo.com>
parents:
9260
diff
changeset
|
928 The @code{keyboard} function does not return an exit status.\n\ |
| 529 | 929 \n\ |
|
9300
fddb9f9f724b
Correct documentation for keyboard function
Rik <rdrider0-list@yahoo.com>
parents:
9260
diff
changeset
|
930 If @code{keyboard} is invoked without arguments, a default prompt of\n\ |
| 3372 | 931 @samp{debug> } is used.\n\ |
|
9300
fddb9f9f724b
Correct documentation for keyboard function
Rik <rdrider0-list@yahoo.com>
parents:
9260
diff
changeset
|
932 @seealso{dbcont, dbquit}\n\ |
| 3372 | 933 @end deftypefn") |
| 529 | 934 { |
| 2086 | 935 octave_value_list retval; |
| 529 | 936 |
| 937 int nargin = args.length (); | |
| 938 | |
| 712 | 939 if (nargin == 0 || nargin == 1) |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7734
diff
changeset
|
940 { |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9999
diff
changeset
|
941 unwind_protect frame; |
|
10186
095a1e670e68
make dbstep work with keyboard function
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
942 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11575
diff
changeset
|
943 frame.add_fcn (octave_call_stack::restore_frame, |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9999
diff
changeset
|
944 octave_call_stack::current_frame ()); |
|
9483
25c2e92ee03c
correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents:
9482
diff
changeset
|
945 |
|
25c2e92ee03c
correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents:
9482
diff
changeset
|
946 // Skip the frame assigned to the keyboard function. |
|
9484
bbe033dcfe13
make dbwhere work when called at keyboard prompt
John W. Eaton <jwe@octave.org>
parents:
9483
diff
changeset
|
947 octave_call_stack::goto_frame_relative (0); |
|
9483
25c2e92ee03c
correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents:
9482
diff
changeset
|
948 |
|
10186
095a1e670e68
make dbstep work with keyboard function
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
949 tree_evaluator::debug_mode = true; |
|
095a1e670e68
make dbstep work with keyboard function
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
950 |
|
095a1e670e68
make dbstep work with keyboard function
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
951 tree_evaluator::current_frame = octave_call_stack::current_frame (); |
|
095a1e670e68
make dbstep work with keyboard function
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
952 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7734
diff
changeset
|
953 do_keyboard (args); |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7734
diff
changeset
|
954 } |
| 529 | 955 else |
| 5823 | 956 print_usage (); |
| 529 | 957 |
| 958 return retval; | |
| 959 } | |
| 960 | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
961 DEFUN (echo, args, , |
| 3332 | 962 "-*- texinfo -*-\n\ |
| 11547 | 963 @deftypefn {Command} {} echo options\n\ |
| 3332 | 964 Control whether commands are displayed as they are executed. Valid\n\ |
| 965 options are:\n\ | |
| 1588 | 966 \n\ |
| 3332 | 967 @table @code\n\ |
| 968 @item on\n\ | |
| 969 Enable echoing of commands as they are executed in script files.\n\ | |
| 970 \n\ | |
| 971 @item off\n\ | |
| 972 Disable echoing of commands as they are executed in script files.\n\ | |
| 1588 | 973 \n\ |
| 3332 | 974 @item on all\n\ |
| 975 Enable echoing of commands as they are executed in script files and\n\ | |
| 976 functions.\n\ | |
| 1588 | 977 \n\ |
| 3332 | 978 @item off all\n\ |
| 979 Disable echoing of commands as they are executed in script files and\n\ | |
| 980 functions.\n\ | |
| 981 @end table\n\ | |
| 982 \n\ | |
| 983 @noindent\n\ | |
|
9134
a3739e27b017
Update section 2.4 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents:
9064
diff
changeset
|
984 With no arguments, @code{echo} toggles the current echo state.\n\ |
| 11547 | 985 @end deftypefn") |
| 1588 | 986 { |
| 2086 | 987 octave_value_list retval; |
| 1588 | 988 |
| 1755 | 989 int argc = args.length () + 1; |
| 990 | |
| 1968 | 991 string_vector argv = args.make_argv ("echo"); |
| 1755 | 992 |
| 993 if (error_state) | |
| 994 return retval; | |
| 1588 | 995 |
| 996 switch (argc) | |
| 997 { | |
| 998 case 1: | |
| 999 { | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1000 if ((Vecho_executing_commands & ECHO_SCRIPTS) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1001 || (Vecho_executing_commands & ECHO_FUNCTIONS)) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1002 Vecho_executing_commands = ECHO_OFF; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1003 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1004 Vecho_executing_commands = ECHO_SCRIPTS; |
| 1588 | 1005 } |
| 1006 break; | |
| 1007 | |
| 1008 case 2: | |
| 1009 { | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1010 std::string arg = argv[1]; |
| 1755 | 1011 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1012 if (arg == "on") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1013 Vecho_executing_commands = ECHO_SCRIPTS; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1014 else if (arg == "off") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1015 Vecho_executing_commands = ECHO_OFF; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1016 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1017 print_usage (); |
| 1588 | 1018 } |
| 1019 break; | |
| 1020 | |
| 1021 case 3: | |
| 1022 { | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1023 std::string arg = argv[1]; |
| 1755 | 1024 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1025 if (arg == "on" && argv[2] == "all") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1026 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1027 int tmp = (ECHO_SCRIPTS | ECHO_FUNCTIONS); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1028 Vecho_executing_commands = tmp; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1029 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1030 else if (arg == "off" && argv[2] == "all") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1031 Vecho_executing_commands = ECHO_OFF; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1032 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1033 print_usage (); |
| 1588 | 1034 } |
| 1035 break; | |
| 1036 | |
| 1037 default: | |
| 5823 | 1038 print_usage (); |
| 1588 | 1039 break; |
| 1040 } | |
| 1041 | |
| 1042 return retval; | |
| 1043 } | |
| 1044 | |
| 2234 | 1045 DEFUN (completion_matches, args, nargout, |
| 3332 | 1046 "-*- texinfo -*-\n\ |
| 1047 @deftypefn {Built-in Function} {} completion_matches (@var{hint})\n\ | |
| 1048 Generate possible completions given @var{hint}.\n\ | |
| 2299 | 1049 \n\ |
| 1050 This function is provided for the benefit of programs like Emacs which\n\ | |
| 3332 | 1051 might be controlling Octave and handling user input. The current\n\ |
| 1052 command number is not incremented when this function is called. This is\n\ | |
| 1053 a feature, not a bug.\n\ | |
| 3333 | 1054 @end deftypefn") |
| 2234 | 1055 { |
| 2281 | 1056 octave_value retval; |
| 2234 | 1057 |
| 1058 int nargin = args.length (); | |
| 1059 | |
| 1060 if (nargin == 1) | |
| 1061 { | |
| 3523 | 1062 std::string hint = args(0).string_value (); |
| 2234 | 1063 |
| 1064 if (! error_state) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1065 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1066 int n = 32; |
| 2234 | 1067 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1068 string_vector list (n); |
| 2234 | 1069 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1070 int k = 0; |
| 2234 | 1071 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1072 for (;;) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1073 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1074 std::string cmd = generate_completion (hint, k); |
| 2234 | 1075 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1076 if (! cmd.empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1077 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1078 if (k == n) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1079 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1080 n *= 2; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1081 list.resize (n); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1082 } |
| 2235 | 1083 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1084 list[k++] = cmd; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1085 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1086 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1087 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1088 list.resize (k); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1089 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1090 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1091 } |
| 2234 | 1092 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1093 if (nargout > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1094 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1095 if (! list.empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1096 retval = list; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1097 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1098 retval = ""; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1099 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1100 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1101 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1102 // We don't use string_vector::list_in_columns here |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1103 // because it will be easier for Emacs if the names |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1104 // appear in a single column. |
| 2235 | 1105 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1106 int len = list.length (); |
| 2234 | 1107 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1108 for (int i = 0; i < len; i++) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1109 octave_stdout << list[i] << "\n"; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1110 } |
| 2299 | 1111 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1112 octave_completion_matches_called = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1113 } |
| 2234 | 1114 } |
| 1115 else | |
| 5823 | 1116 print_usage (); |
| 2234 | 1117 |
| 1118 return retval; | |
| 1119 } | |
| 1120 | |
| 3189 | 1121 DEFUN (read_readline_init_file, args, , |
| 3448 | 1122 "-*- texinfo -*-\n\ |
| 1123 @deftypefn {Built-in Function} {} read_readline_init_file (@var{file})\n\ | |
| 7007 | 1124 Read the readline library initialization file @var{file}. If\n\ |
| 3448 | 1125 @var{file} is omitted, read the default initialization file (normally\n\ |
| 6615 | 1126 @file{~/.inputrc}).\n\ |
| 1127 \n\ | |
| 1128 @xref{Readline Init File, , , readline, GNU Readline Library},\n\ | |
| 1129 for details.\n\ | |
| 3448 | 1130 @end deftypefn") |
| 3189 | 1131 { |
| 1132 octave_value_list retval; | |
| 1133 | |
| 1134 int nargin = args.length (); | |
| 1135 | |
| 1136 if (nargin == 0) | |
| 1137 command_editor::read_init_file (); | |
| 1138 else if (nargin == 1) | |
| 1139 { | |
| 5872 | 1140 std::string file = args(0).string_value (); |
| 3189 | 1141 |
| 1142 if (! error_state) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1143 command_editor::read_init_file (file); |
| 3189 | 1144 } |
| 1145 else | |
| 5823 | 1146 print_usage (); |
| 3189 | 1147 |
| 1148 return retval; | |
| 1149 } | |
| 1150 | |
|
7758
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1151 DEFUN (re_read_readline_init_file, args, , |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1152 "-*- texinfo -*-\n\ |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1153 @deftypefn {Built-in Function} {} re_read_readline_init_file ()\n\ |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1154 Re-read the last readline library initialization file that was read.\n\ |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1155 @xref{Readline Init File, , , readline, GNU Readline Library},\n\ |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1156 for details.\n\ |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1157 @end deftypefn") |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1158 { |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1159 octave_value_list retval; |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1160 |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1161 if (args.length () == 0) |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1162 command_editor::re_read_init_file (); |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1163 else |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1164 print_usage (); |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1165 |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1166 return retval; |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1167 } |
|
8e14a01ffe9f
input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1168 |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1169 typedef std::map<std::string, octave_value> hook_fcn_map_type; |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1170 |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1171 static hook_fcn_map_type hook_fcn_map; |
| 3498 | 1172 |
| 4802 | 1173 static int |
| 3519 | 1174 input_event_hook (void) |
| 3498 | 1175 { |
|
16149
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1176 hook_fcn_map_type::iterator p = hook_fcn_map.begin (); |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1177 |
|
16149
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1178 while (p != hook_fcn_map.end ()) |
|
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1179 { |
|
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1180 std::string hook_fcn = p->first; |
|
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1181 octave_value user_data = p->second; |
|
11367
b2191ebea12f
don't process input_event_hook when we are parsing a function
John W. Eaton <jwe@octave.org>
parents:
11258
diff
changeset
|
1182 |
|
16149
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1183 hook_fcn_map_type::iterator q = p++; |
|
11367
b2191ebea12f
don't process input_event_hook when we are parsing a function
John W. Eaton <jwe@octave.org>
parents:
11258
diff
changeset
|
1184 |
|
16149
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1185 if (is_valid_function (hook_fcn)) |
|
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1186 { |
|
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1187 if (user_data.is_defined ()) |
|
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1188 feval (hook_fcn, user_data, 0); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1189 else |
|
16149
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1190 feval (hook_fcn, octave_value_list (), 0); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1191 } |
|
16149
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1192 else |
|
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1193 hook_fcn_map.erase (q); |
| 4526 | 1194 } |
| 1195 | |
|
16149
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1196 if (hook_fcn_map.empty ()) |
|
49dfba4fd3c5
use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents:
16139
diff
changeset
|
1197 command_editor::remove_event_hook (input_event_hook); |
|
16152
c48847a781d5
* input.cc (input_event_hook): Return 0.
John W. Eaton <jwe@octave.org>
parents:
16151
diff
changeset
|
1198 |
|
c48847a781d5
* input.cc (input_event_hook): Return 0.
John W. Eaton <jwe@octave.org>
parents:
16151
diff
changeset
|
1199 return 0; |
| 3498 | 1200 } |
| 1201 | |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1202 DEFUN (add_input_event_hook, args, , |
| 3498 | 1203 "-*- texinfo -*-\n\ |
|
12573
232a90612254
Add new section on parsing to documentation.
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1204 @deftypefn {Built-in Function} {} add_input_event_hook (@var{fcn})\n\ |
|
232a90612254
Add new section on parsing to documentation.
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1205 @deftypefnx {Built-in Function} {} add_input_event_hook (@var{fcn}, @var{data})\n\ |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1206 Add the named function @var{fcn} to the list of functions to call\n\ |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1207 periodically when Octave is waiting for input. The function should\n\ |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1208 have the form\n\ |
| 10840 | 1209 \n\ |
| 3498 | 1210 @example\n\ |
| 1211 @var{fcn} (@var{data})\n\ | |
| 1212 @end example\n\ | |
| 1213 \n\ | |
| 1214 If @var{data} is omitted, Octave calls the function without any\n\ | |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1215 arguments.\n\ |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1216 @seealso{remove_input_event_hook}\n\ |
| 3498 | 1217 @end deftypefn") |
| 1218 { | |
| 1219 octave_value_list retval; | |
| 1220 | |
| 1221 int nargin = args.length (); | |
| 1222 | |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1223 if (nargin == 1 || nargin == 2) |
| 3498 | 1224 { |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1225 octave_value user_data; |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1226 |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1227 if (nargin == 2) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1228 user_data = args(1); |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1229 |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1230 std::string hook_fcn = args(0).string_value (); |
| 3498 | 1231 |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1232 if (! error_state) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1233 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1234 if (hook_fcn_map.empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1235 command_editor::add_event_hook (input_event_hook); |
| 3498 | 1236 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1237 hook_fcn_map[hook_fcn] = user_data; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1238 } |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1239 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1240 error ("add_input_event_hook: expecting string as first arg"); |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1241 } |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1242 else |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1243 print_usage (); |
| 3498 | 1244 |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1245 return retval; |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1246 } |
| 3498 | 1247 |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1248 DEFUN (remove_input_event_hook, args, , |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1249 "-*- texinfo -*-\n\ |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1250 @deftypefn {Built-in Function} {} remove_input_event_hook (@var{fcn})\n\ |
|
12573
232a90612254
Add new section on parsing to documentation.
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1251 Remove the named function @var{fcn} from the list of functions to call\n\ |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1252 periodically when Octave is waiting for input.\n\ |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1253 @seealso{add_input_event_hook}\n\ |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1254 @end deftypefn") |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1255 { |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1256 octave_value_list retval; |
| 3498 | 1257 |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1258 int nargin = args.length (); |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1259 |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1260 if (nargin == 1) |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1261 { |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1262 std::string hook_fcn = args(0).string_value (); |
| 3498 | 1263 |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1264 if (! error_state) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1265 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1266 hook_fcn_map_type::iterator p = hook_fcn_map.find (hook_fcn); |
| 3498 | 1267 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1268 if (p != hook_fcn_map.end ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1269 hook_fcn_map.erase (p); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1270 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1271 error ("remove_input_event_hook: %s not found in list", |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1272 hook_fcn.c_str ()); |
| 3498 | 1273 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1274 if (hook_fcn_map.empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1275 command_editor::remove_event_hook (input_event_hook); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1276 } |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1277 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10186
diff
changeset
|
1278 error ("remove_input_event_hook: expecting string as first arg"); |
| 3498 | 1279 } |
|
9215
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1280 else |
|
1500d0197484
allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents:
9134
diff
changeset
|
1281 print_usage (); |
| 3498 | 1282 |
| 1283 return retval; | |
| 1284 } | |
| 1285 | |
| 5794 | 1286 DEFUN (PS1, args, nargout, |
| 1287 "-*- texinfo -*-\n\ | |
| 10840 | 1288 @deftypefn {Built-in Function} {@var{val} =} PS1 ()\n\ |
| 5794 | 1289 @deftypefnx {Built-in Function} {@var{old_val} =} PS1 (@var{new_val})\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1290 @deftypefnx {Built-in Function} {} PS1 (@var{new_val}, \"local\")\n\ |
| 5794 | 1291 Query or set the primary prompt string. When executing interactively,\n\ |
| 1292 Octave displays the primary prompt when it is ready to read a command.\n\ | |
| 3332 | 1293 \n\ |
| 5794 | 1294 The default value of the primary prompt string is @code{\"\\s:\\#> \"}.\n\ |
| 1295 To change it, use a command like\n\ | |
| 3332 | 1296 \n\ |
| 1297 @example\n\ | |
|
11405
51b6193e90bb
Documentation fixes
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11367
diff
changeset
|
1298 PS1 (\"\\\\u@@\\\\H> \")\n\ |
| 3332 | 1299 @end example\n\ |
| 1300 \n\ | |
| 1301 @noindent\n\ | |
| 1302 which will result in the prompt @samp{boris@@kremvax> } for the user\n\ | |
| 1303 @samp{boris} logged in on the host @samp{kremvax.kgb.su}. Note that two\n\ | |
| 5794 | 1304 backslashes are required to enter a backslash into a double-quoted\n\ |
|
11413
ae0deb52af27
Correct use of xref macro to prevent Texinfo warning.
Rik <octave@nomad.inbox5.com>
parents:
11405
diff
changeset
|
1305 character string. @xref{Strings}.\n\ |
|
11405
51b6193e90bb
Documentation fixes
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11367
diff
changeset
|
1306 \n\ |
|
51b6193e90bb
Documentation fixes
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11367
diff
changeset
|
1307 You can also use ANSI escape sequences if your terminal supports them.\n\ |
|
11575
d6619410e79c
Spellcheck documentation before 3.4 release.
Rik <octave@nomad.inbox5.com>
parents:
11572
diff
changeset
|
1308 This can be useful for coloring the prompt. For example,\n\ |
|
11405
51b6193e90bb
Documentation fixes
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11367
diff
changeset
|
1309 \n\ |
|
51b6193e90bb
Documentation fixes
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11367
diff
changeset
|
1310 @example\n\ |
|
14880
9e5df4d6cefa
doc: typo on PS1 documentation example
Carnë Draug <carandraug+dev@gmail.com>
parents:
14138
diff
changeset
|
1311 PS1 (\"\\\\[\\\\033[01;31m\\\\]\\\\s:\\\\#> \\\\[\\\\033[0m\\\\]\")\n\ |
|
11405
51b6193e90bb
Documentation fixes
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11367
diff
changeset
|
1312 @end example\n\ |
|
51b6193e90bb
Documentation fixes
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11367
diff
changeset
|
1313 \n\ |
|
11572
7d6d8c1e471f
Grammarcheck Texinfo for files in src directory.
Rik <octave@nomad.inbox5.com>
parents:
11547
diff
changeset
|
1314 @noindent\n\ |
|
11575
d6619410e79c
Spellcheck documentation before 3.4 release.
Rik <octave@nomad.inbox5.com>
parents:
11572
diff
changeset
|
1315 will give the default Octave prompt a red coloring.\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1316 \n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1317 When called from inside a function with the \"local\" option, the variable is\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1318 changed locally for the function and any subroutines it calls. The original\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1319 variable value is restored when exiting the function.\n\ |
| 6373 | 1320 @seealso{PS2, PS4}\n\ |
| 5794 | 1321 @end deftypefn") |
| 1322 { | |
| 1323 return SET_INTERNAL_VARIABLE (PS1); | |
| 1324 } | |
| 2181 | 1325 |
| 5794 | 1326 DEFUN (PS2, args, nargout, |
| 1327 "-*- texinfo -*-\n\ | |
| 10840 | 1328 @deftypefn {Built-in Function} {@var{val} =} PS2 ()\n\ |
| 5794 | 1329 @deftypefnx {Built-in Function} {@var{old_val} =} PS2 (@var{new_val})\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1330 @deftypefnx {Built-in Function} {} PS2 (@var{new_val}, \"local\")\n\ |
| 5794 | 1331 Query or set the secondary prompt string. The secondary prompt is\n\ |
| 1332 printed when Octave is expecting additional input to complete a\n\ | |
|
9035
57649dcecb55
Documentation cleanup of basics.texi
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
1333 command. For example, if you are typing a @code{for} loop that spans several\n\ |
| 5794 | 1334 lines, Octave will print the secondary prompt at the beginning of\n\ |
| 1335 each line after the first. The default value of the secondary prompt\n\ | |
| 1336 string is @code{\"> \"}.\n\ | |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1337 \n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1338 When called from inside a function with the \"local\" option, the variable is\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1339 changed locally for the function and any subroutines it calls. The original\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1340 variable value is restored when exiting the function.\n\ |
| 5794 | 1341 @seealso{PS1, PS4}\n\ |
| 1342 @end deftypefn") | |
| 1343 { | |
| 1344 return SET_INTERNAL_VARIABLE (PS2); | |
| 1345 } | |
| 2181 | 1346 |
| 5794 | 1347 DEFUN (PS4, args, nargout, |
| 1348 "-*- texinfo -*-\n\ | |
| 10840 | 1349 @deftypefn {Built-in Function} {@var{val} =} PS4 ()\n\ |
| 5794 | 1350 @deftypefnx {Built-in Function} {@var{old_val} =} PS4 (@var{new_val})\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1351 @deftypefnx {Built-in Function} {} PS4 (@var{new_val}, \"local\")\n\ |
| 5794 | 1352 Query or set the character string used to prefix output produced\n\ |
|
9134
a3739e27b017
Update section 2.4 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents:
9064
diff
changeset
|
1353 when echoing commands is enabled.\n\ |
| 6620 | 1354 The default value is @code{\"+ \"}.\n\ |
|
9134
a3739e27b017
Update section 2.4 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents:
9064
diff
changeset
|
1355 @xref{Diary and Echo Commands}, for a description of echoing commands.\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1356 \n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1357 When called from inside a function with the \"local\" option, the variable is\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1358 changed locally for the function and any subroutines it calls. The original\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1359 variable value is restored when exiting the function.\n\ |
|
9134
a3739e27b017
Update section 2.4 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents:
9064
diff
changeset
|
1360 @seealso{echo, echo_executing_commands, PS1, PS2}\n\ |
| 5794 | 1361 @end deftypefn") |
| 1362 { | |
| 1363 return SET_INTERNAL_VARIABLE (PS4); | |
| 1364 } | |
| 2181 | 1365 |
| 5794 | 1366 DEFUN (completion_append_char, args, nargout, |
| 1367 "-*- texinfo -*-\n\ | |
| 10840 | 1368 @deftypefn {Built-in Function} {@var{val} =} completion_append_char ()\n\ |
| 5794 | 1369 @deftypefnx {Built-in Function} {@var{old_val} =} completion_append_char (@var{new_val})\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1370 @deftypefnx {Built-in Function} {} completion_append_char (@var{new_val}, \"local\")\n\ |
| 5794 | 1371 Query or set the internal character variable that is appended to\n\ |
| 1372 successful command-line completion attempts. The default\n\ | |
| 3332 | 1373 value is @code{\" \"} (a single space).\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1374 \n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1375 When called from inside a function with the \"local\" option, the variable is\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1376 changed locally for the function and any subroutines it calls. The original\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1377 variable value is restored when exiting the function.\n\ |
| 5794 | 1378 @end deftypefn") |
| 1379 { | |
| 1380 return SET_INTERNAL_VARIABLE (completion_append_char); | |
| 1381 } | |
| 3019 | 1382 |
| 5794 | 1383 DEFUN (echo_executing_commands, args, nargout, |
| 1384 "-*- texinfo -*-\n\ | |
| 10840 | 1385 @deftypefn {Built-in Function} {@var{val} =} echo_executing_commands ()\n\ |
| 5794 | 1386 @deftypefnx {Built-in Function} {@var{old_val} =} echo_executing_commands (@var{new_val})\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1387 @deftypefnx {Built-in Function} {} echo_executing_commands (@var{new_val}, \"local\")\n\ |
| 5794 | 1388 Query or set the internal variable that controls the echo state.\n\ |
| 1389 It may be the sum of the following values:\n\ | |
| 3332 | 1390 \n\ |
| 1391 @table @asis\n\ | |
| 1392 @item 1\n\ | |
| 1393 Echo commands read from script files.\n\ | |
| 1394 \n\ | |
| 1395 @item 2\n\ | |
| 1396 Echo commands from functions.\n\ | |
| 1397 \n\ | |
| 1398 @item 4\n\ | |
| 1399 Echo commands read from command line.\n\ | |
| 1400 @end table\n\ | |
| 1401 \n\ | |
| 1402 More than one state can be active at once. For example, a value of 3 is\n\ | |
| 1403 equivalent to the command @kbd{echo on all}.\n\ | |
| 1404 \n\ | |
|
9134
a3739e27b017
Update section 2.4 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents:
9064
diff
changeset
|
1405 The value of @code{echo_executing_commands} may be set by the @kbd{echo}\n\ |
| 10840 | 1406 command or the command line option @option{--echo-commands}.\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1407 \n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1408 When called from inside a function with the \"local\" option, the variable is\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1409 changed locally for the function and any subroutines it calls. The original\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1410 variable value is restored when exiting the function.\n\ |
| 5794 | 1411 @end deftypefn") |
| 1412 { | |
| 1413 return SET_INTERNAL_VARIABLE (echo_executing_commands); | |
| 2181 | 1414 } |
| 1415 | |
| 6257 | 1416 DEFUN (__request_drawnow__, args, , |
| 1417 "-*- texinfo -*-\n\ | |
| 10840 | 1418 @deftypefn {Built-in Function} {} __request_drawnow__ ()\n\ |
| 6257 | 1419 @deftypefnx {Built-in Function} {} __request_drawnow__ (@var{flag})\n\ |
| 6945 | 1420 Undocumented internal function.\n\ |
| 6257 | 1421 @end deftypefn") |
| 1422 { | |
| 1423 octave_value retval; | |
| 1424 | |
| 1425 int nargin = args.length (); | |
| 1426 | |
| 1427 if (nargin == 0) | |
| 1428 Vdrawnow_requested = true; | |
| 1429 else if (nargin == 1) | |
| 1430 Vdrawnow_requested = args(0).bool_value (); | |
| 1431 else | |
| 1432 print_usage (); | |
| 1433 | |
| 1434 return retval; | |
| 1435 } | |
| 1436 | |
| 7294 | 1437 DEFUN (__gud_mode__, args, , |
| 1438 "-*- texinfo -*-\n\ | |
| 1439 @deftypefn {Built-in Function} {} __gud_mode__ ()\n\ | |
| 1440 Undocumented internal function.\n\ | |
| 1441 @end deftypefn") | |
| 1442 { | |
| 1443 octave_value retval; | |
| 1444 | |
| 1445 int nargin = args.length (); | |
| 1446 | |
| 1447 if (nargin == 0) | |
| 1448 retval = Vgud_mode; | |
| 1449 else if (nargin == 1) | |
| 1450 Vgud_mode = args(0).bool_value (); | |
| 1451 else | |
| 1452 print_usage (); | |
| 1453 | |
| 1454 return retval; | |
| 1455 } | |
| 1456 | |
|
7818
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1457 DEFUN (filemarker, args, nargout, |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1458 "-*- texinfo -*-\n\ |
|
12211
11faa69c4eaa
Add S_ISBLK and family of functions to documentation.
Rik <octave@nomad.inbox5.com>
parents:
12179
diff
changeset
|
1459 @deftypefn {Built-in Function} {@var{val} =} filemarker ()\n\ |
|
11faa69c4eaa
Add S_ISBLK and family of functions to documentation.
Rik <octave@nomad.inbox5.com>
parents:
12179
diff
changeset
|
1460 @deftypefnx {Built-in Function} {} filemarker (@var{new_val})\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1461 @deftypefnx {Built-in Function} {} filemarker (@var{new_val}, \"local\")\n\ |
|
11572
7d6d8c1e471f
Grammarcheck Texinfo for files in src directory.
Rik <octave@nomad.inbox5.com>
parents:
11547
diff
changeset
|
1462 Query or set the character used to separate filename from the\n\ |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
9035
diff
changeset
|
1463 the subfunction names contained within the file. This can be used in\n\ |
| 10840 | 1464 a generic manner to interact with subfunctions. For example,\n\ |
|
7818
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1465 \n\ |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1466 @example\n\ |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1467 help ([\"myfunc\", filemarker, \"mysubfunc\"])\n\ |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1468 @end example\n\ |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1469 \n\ |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1470 @noindent\n\ |
|
14852
53d2c3598d33
doc: Periodic spellcheck of documentation.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
1471 returns the help string associated with the subfunction @code{mysubfunc}\n\ |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
9035
diff
changeset
|
1472 of the function @code{myfunc}. Another use of @code{filemarker} is when\n\ |
|
14852
53d2c3598d33
doc: Periodic spellcheck of documentation.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
1473 debugging it allows easier placement of breakpoints within subfunctions.\n\ |
| 10840 | 1474 For example,\n\ |
|
7818
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1475 \n\ |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1476 @example\n\ |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1477 dbstop ([\"myfunc\", filemarker, \"mysubfunc\"])\n\ |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1478 @end example\n\ |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1479 \n\ |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1480 @noindent\n\ |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1481 will set a breakpoint at the first line of the subfunction @code{mysubfunc}.\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1482 \n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1483 When called from inside a function with the \"local\" option, the variable is\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1484 changed locally for the function and any subroutines it calls. The original\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13266
diff
changeset
|
1485 variable value is restored when exiting the function.\n\ |
|
7818
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1486 @end deftypefn") |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1487 { |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1488 char tmp = Vfilemarker; |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1489 octave_value retval = SET_INTERNAL_VARIABLE (filemarker); |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1490 |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1491 // The character passed must not be a legal character for a function name |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1492 if (! error_state && (::isalnum (Vfilemarker) || Vfilemarker == '_')) |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1493 { |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1494 Vfilemarker = tmp; |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1495 error ("filemarker: character can not be a valid character for a function name"); |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1496 } |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1497 |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1498 return retval; |
|
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7787
diff
changeset
|
1499 } |