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