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