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