octave: libinterp/corefcn/input.cc annotate

annotate libinterp/corefcn/input.cc @ 26061:cb3ead3cf859 stable

avoid assertion failure with -D_GLIBCXX_ASSERTIONS * input.cc (base_reader::octave_gets): Don't call "back" on empty string.

author	Orion Poplawski <orion@cora.nwra.com>
date	Mon, 12 Nov 2018 11:21:02 -0500
parents	6652d3823428
children	41656e99ae60

rev	line source
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1 /*
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25034 diff changeset	3 Copyright (C) 1993-2018 John W. Eaton
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	4
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24362 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24362 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 (at your option) any later version.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 GNU General Public License for more details.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	16
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7007 diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24362 diff changeset	19 <https://www.gnu.org/licenses/>.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	20
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	21 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	22
2939 f2feebf0eb7d [project @ 1997-05-06 16:36:34 by jwe] jwe parents: 2927 diff changeset	23 // Get command input interactively or from files.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	24
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21547 diff changeset	25 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	26 # include "config.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	27 #endif
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	28
10463 bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	29 #include <cstdio>
1343 94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1315 diff changeset	30 #include <cstdlib>
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1315 diff changeset	31 #include <cstring>
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1315 diff changeset	32 #include <cassert>
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1315 diff changeset	33
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3498 diff changeset	34 #include <iostream>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5744 diff changeset	35 #include <sstream>
1728 42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe] jwe parents: 1705 diff changeset	36 #include <string>
42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe] jwe parents: 1705 diff changeset	37
2927 8722c6284b72 [project @ 1997-05-05 03:44:04 by jwe] jwe parents: 2921 diff changeset	38 #include "cmd-edit.h"
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	39 #include "file-ops.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4143 diff changeset	40 #include "quit.h"
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1750 diff changeset	41 #include "str-vec.h"
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1750 diff changeset	42
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23129 diff changeset	43 #include "bp-table.h"
23129 35e3d199527c Replace feval calls with direct call to C++ function (bug #50116). Rik <rik@octave.org> parents: 23127 diff changeset	44 #include "builtin-defun-decls.h"
22091 0f6fc2ec3b1a move call_stack class to a separate file John W. Eaton <jwe@octave.org> parents: 22089 diff changeset	45 #include "call-stack.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1350 diff changeset	46 #include "defun.h"
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1350 diff changeset	47 #include "dirfns.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	48 #include "error.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21078 diff changeset	49 #include "errwarn.h"
3016 f512c16826d1 [project @ 1997-06-03 03:16:13 by jwe] jwe parents: 3014 diff changeset	50 #include "help.h"
16381 f33dcbd6a005 move hook_function classes to separate file John W. Eaton <jwe@octave.org> parents: 16378 diff changeset	51 #include "hook-fcn.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	52 #include "input.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	53 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22091 diff changeset	54 #include "interpreter.h"
9999 653716f3d976 get_debug_input: force interactive input mode; don't get user input unless stdin is a tty John W. Eaton <jwe@octave.org> parents: 9485 diff changeset	55 #include "lex.h"
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: 5823 diff changeset	56 #include "load-path.h"
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	57 #include "octave.h"
16416 169f71c9d9c8 use octave_link instead of hook functions in input.cc John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	58 #include "octave-link.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1350 diff changeset	59 #include "oct-map.h"
1742 a02f140ed897 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: 1728 diff changeset	60 #include "oct-hist.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22091 diff changeset	61 #include "interpreter.h"
16528 9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16524 diff changeset	62 #include "octave-link.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20939 diff changeset	63 #include "ovl.h"
16347 bf8397caeff1 allow add_input_event_hook to accept function handles John W. Eaton <jwe@octave.org> parents: 16336 diff changeset	64 #include "ov-fcn-handle.h"
23127 5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	65 #include "ov-usr-fcn.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	66 #include "pager.h"
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	67 #include "parse.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 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: 3804 diff changeset	69 #include "pt-stmt.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1350 diff changeset	70 #include "sighandlers.h"
1114 971f2289d6de [project @ 1995-02-15 04:58:06 by jwe] jwe parents: 1112 diff changeset	71 #include "sysdep.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22091 diff changeset	72 #include "interpreter.h"
3098 f4acdc9a77cc [project @ 1997-11-14 09:30:20 by jwe] jwe parents: 3081 diff changeset	73 #include "unwind-prot.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1350 diff changeset	74 #include "utils.h"
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1350 diff changeset	75 #include "variables.h"
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	76
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2114 diff changeset	77 // Primary prompt string.
16528 9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16524 diff changeset	78 static std::string VPS1;
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2114 diff changeset	79
138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2114 diff changeset	80 // Secondary prompt string.
16528 9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16524 diff changeset	81 static std::string VPS2;
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2114 diff changeset	82
3165 e4bbfc196e53 [project @ 1998-04-16 03:01:47 by jwe] jwe parents: 3100 diff changeset	83 // The time we last printed a prompt.
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	84 octave::sys::time Vlast_prompt_time = 0.0;
3165 e4bbfc196e53 [project @ 1998-04-16 03:01:47 by jwe] jwe parents: 3100 diff changeset	85
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2114 diff changeset	86 // Character to append after successful command-line completion attempts.
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	87 static char Vcompletion_append_char = ' ';
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2114 diff changeset	88
3804 4073be5aefa1 [project @ 2001-02-28 08:36:04 by jwe] jwe parents: 3772 diff changeset	89 // TRUE after a call to completion_matches.
2299 f296bbc757a1 [project @ 1996-06-23 03:45:44 by jwe] jwe parents: 2287 diff changeset	90 bool octave_completion_matches_called = false;
f296bbc757a1 [project @ 1996-06-23 03:45:44 by jwe] jwe parents: 2287 diff changeset	91
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	92 // TRUE if the plotting system has requested a call to drawnow at
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	93 // the next user prompt.
7409 73036cdd855d [project @ 2008-01-22 20:31:59 by jwe] jwe parents: 7336 diff changeset	94 bool Vdrawnow_requested = false;
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	95
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7734 diff changeset	96 // TRUE if we are in debugging mode.
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7734 diff changeset	97 bool Vdebugging = false;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7734 diff changeset	98
22164 5d4a286061c8 Track line numbers when in debug mode (bug #45764) Lachlan Andrew <lachlanbis@gmail.com> parents: 22094 diff changeset	99 // TRUE if we are recording line numbers in a source file.
5d4a286061c8 Track line numbers when in debug mode (bug #45764) Lachlan Andrew <lachlanbis@gmail.com> parents: 22094 diff changeset	100 // Always true except when debugging and taking input directly from
5d4a286061c8 Track line numbers when in debug mode (bug #45764) Lachlan Andrew <lachlanbis@gmail.com> parents: 22094 diff changeset	101 // the terminal.
5d4a286061c8 Track line numbers when in debug mode (bug #45764) Lachlan Andrew <lachlanbis@gmail.com> parents: 22094 diff changeset	102 bool Vtrack_line_num = true;
5d4a286061c8 Track line numbers when in debug mode (bug #45764) Lachlan Andrew <lachlanbis@gmail.com> parents: 22094 diff changeset	103
8841 c74389115610 auto repeat for debugging commands John W. Eaton <jwe@octave.org> parents: 8749 diff changeset	104 // 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	105 // that we can repeat the previous command if the user just types RET.
16336 0ce49f9fb171 "\n" is the new empty string (bug #38552) John W. Eaton <jwe@octave.org> parents: 16288 diff changeset	106 static std::string last_debugging_command = "\n";
8841 c74389115610 auto repeat for debugging commands John W. Eaton <jwe@octave.org> parents: 8749 diff changeset	107
7294 fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	108 // TRUE if we are running in the Emacs GUD mode.
fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	109 static bool Vgud_mode = false;
fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	110
16378 b28ae106e316 use class for lists of input hook functions John W. Eaton <jwe@octave.org> parents: 16374 diff changeset	111 static hook_function_list input_event_hook_functions;
16349 610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	112
610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	113 // For octave_quit.
610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	114 void
610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	115 remove_input_event_hook_functions (void)
610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	116 {
16378 b28ae106e316 use class for lists of input hook functions John W. Eaton <jwe@octave.org> parents: 16374 diff changeset	117 input_event_hook_functions.clear ();
16349 610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	118 }
610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	119
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16208 diff changeset	120 void
16528 9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16524 diff changeset	121 set_default_prompts (void)
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16524 diff changeset	122 {
18037 708173343c50 use "octave" instead of "\\s" in default prompt John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	123 // Use literal "octave" instead of "\\s" to avoid setting the prompt
708173343c50 use "octave" instead of "\\s" in default prompt John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	124 // to "octave.exe" or "octave-gui", etc.
708173343c50 use "octave" instead of "\\s" in default prompt John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	125
23804 8057d3f0673d Use C++11 raw string literals to avoid escaping backslashes in strings. Rik <rik@octave.org> parents: 23803 diff changeset	126 VPS1 = R"(octave:\#> )";
16528 9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16524 diff changeset	127 VPS2 = "> ";
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	128 std::string VPS4 = "+ ";
16528 9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16524 diff changeset	129
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16524 diff changeset	130 octave_link::set_default_prompts (VPS1, VPS2, VPS4);
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16524 diff changeset	131 }
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16524 diff changeset	132
16198 2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	133 static std::string
2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	134 gnu_readline (const std::string& s, bool& eof)
1822 3a47ca3dd227 [project @ 1996-02-01 08:06:35 by jwe] jwe parents: 1799 diff changeset	135 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 10066 diff changeset	136 octave_quit ();
5142 0f9108f298ab [project @ 2005-02-12 02:29:34 by jwe] jwe parents: 5092 diff changeset	137
16097 2f4fa62089b3 improve end of file handling for lexer input John W. Eaton <jwe@octave.org> parents: 16053 diff changeset	138 eof = false;
2f4fa62089b3 improve end of file handling for lexer input John W. Eaton <jwe@octave.org> parents: 16053 diff changeset	139
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	140 std::string retval = octave::command_editor::readline (s, eof);
19595 be7ac98fab43 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19379 diff changeset	141
16198 2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	142 if (! eof && retval.empty ())
2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	143 retval = "\n";
1822 3a47ca3dd227 [project @ 1996-02-01 08:06:35 by jwe] jwe parents: 1799 diff changeset	144
3a47ca3dd227 [project @ 1996-02-01 08:06:35 by jwe] jwe parents: 1799 diff changeset	145 return retval;
3a47ca3dd227 [project @ 1996-02-01 08:06:35 by jwe] jwe parents: 1799 diff changeset	146 }
581 bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe] jwe parents: 529 diff changeset	147
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	148 static inline std::string
16198 2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	149 interactive_input (const std::string& s, bool& eof)
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	150 {
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	151 Vlast_prompt_time.stamp ();
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	152
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	153 if (Vdrawnow_requested && octave::application::interactive ())
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	154 {
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	155 bool eval_error = false;
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	156
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	157 try
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	158 {
23129 35e3d199527c Replace feval calls with direct call to C++ function (bug #50116). Rik <rik@octave.org> parents: 23127 diff changeset	159 Fdrawnow ();
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	160 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	161 catch (const octave::execution_exception& e)
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	162 {
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	163 eval_error = true;
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	164
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	165 std::string stack_trace = e.info ();
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	166
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	167 if (! stack_trace.empty ())
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	168 std::cerr << stack_trace;
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	169
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	170 if (octave::application::interactive ())
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	171 octave::interpreter::recover_from_exception ();
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	172 }
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	173
23060 baf03cdb28b5 move pager and diary classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	174 octave::flush_stdout ();
6367 268bfc8a2755 [project @ 2007-02-28 20:16:05 by jwe] jwe parents: 6317 diff changeset	175
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	176 // We set Vdrawnow_requested to false even if there is an error in
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	177 // drawnow so that the error doesn't reappear at every prompt.
6305 48f8af442b8a [project @ 2007-02-14 22:16:53 by jwe] jwe parents: 6257 diff changeset	178
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	179 Vdrawnow_requested = false;
6305 48f8af442b8a [project @ 2007-02-14 22:16:53 by jwe] jwe parents: 6257 diff changeset	180
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	181 if (eval_error)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	182 return "\n";
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	183 }
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	184
16198 2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	185 return gnu_readline (s, eof);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	186 }
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	187
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	188 namespace octave
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	189 {
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	190 std::string base_reader::octave_gets (bool& eof)
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	191 {
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	192 octave_quit ();
5142 0f9108f298ab [project @ 2005-02-12 02:29:34 by jwe] jwe parents: 5092 diff changeset	193
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	194 eof = false;
16097 2f4fa62089b3 improve end of file handling for lexer input John W. Eaton <jwe@octave.org> parents: 16053 diff changeset	195
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	196 std::string retval;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	197
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	198 // Process pre input event hook function prior to flushing output and
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	199 // printing the prompt.
16349 610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	200
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	201 if (application::interactive ())
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	202 {
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	203 if (! Vdebugging)
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	204 octave_link::exit_debugger_event ();
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16433 diff changeset	205
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	206 octave_link::pre_input_event ();
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	207
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	208 octave_link::set_workspace ();
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	209 }
16349 610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	210
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	211 bool history_skip_auto_repeated_debugging_command = false;
8841 c74389115610 auto repeat for debugging commands John W. Eaton <jwe@octave.org> parents: 8749 diff changeset	212
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	213 std::string ps = (m_pflag > 0) ? VPS1 : VPS2;
16198 2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	214
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	215 std::string prompt = command_editor::decode_prompt_string (ps);
16198 2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	216
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	217 pipe_handler_error_count = 0;
16198 2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	218
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	219 flush_stdout ();
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1750 diff changeset	220
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	221 pager_stream::reset ();
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	222 diary_stream::reset ();
2618 aa667ac18d12 [project @ 1997-01-23 03:16:28 by jwe] jwe parents: 2470 diff changeset	223
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	224 octave_diary << prompt;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	225
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	226 retval = interactive_input (prompt, eof);
581 bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe] jwe parents: 529 diff changeset	227
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	228 // There is no need to update the load_path cache if there is no
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	229 // user input.
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	230 if (retval != "\n"
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	231 && retval.find_first_not_of (" \t\n\r") != std::string::npos)
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	232 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	233 load_path& lp = __get_load_path__ ("base_reader::octave_gets");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	234
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	235 lp.update ();
8841 c74389115610 auto repeat for debugging commands John W. Eaton <jwe@octave.org> parents: 8749 diff changeset	236
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	237 if (Vdebugging)
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	238 last_debugging_command = retval;
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	239 else
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	240 last_debugging_command = "\n";
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	241 }
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	242 else if (Vdebugging)
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	243 {
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	244 retval = last_debugging_command;
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	245 history_skip_auto_repeated_debugging_command = true;
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	246 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	247
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	248 if (retval != "\n")
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	249 {
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	250 if (! history_skip_auto_repeated_debugging_command)
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	251 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	252 if (command_history::add (retval))
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	253 octave_link::append_history (retval);
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	254 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	255
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	256 octave_diary << retval;
3176 fccab8e7d35f [project @ 1998-05-18 20:33:31 by jwe] jwe parents: 3165 diff changeset	257
26061 cb3ead3cf859 avoid assertion failure with -D_GLIBCXX_ASSERTIONS Orion Poplawski <orion@cora.nwra.com> parents: 25054 diff changeset	258 if (! retval.empty () && retval.back () != '\n')
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	259 octave_diary << "\n";
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	260 }
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	261 else
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	262 octave_diary << "\n";
581 bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe] jwe parents: 529 diff changeset	263
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	264 // Process post input event hook function after the internal history
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	265 // list has been updated.
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9396 diff changeset	266
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	267 if (application::interactive ())
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	268 octave_link::post_input_event ();
16349 610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	269
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	270 return retval;
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	271 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	272
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	273 bool base_reader::reading_fcn_file (void) const
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	274 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	275 return m_lexer ? m_lexer->m_reading_fcn_file : false;
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	276 }
17731 f79bf671a493 eliminate global LEXER variable John W. Eaton <jwe@octave.org> parents: 17323 diff changeset	277
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	278 bool base_reader::reading_classdef_file (void) const
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	279 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	280 return m_lexer ? m_lexer->m_reading_classdef_file : false;
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	281 }
17731 f79bf671a493 eliminate global LEXER variable John W. Eaton <jwe@octave.org> parents: 17323 diff changeset	282
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	283 bool base_reader::reading_script_file (void) const
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	284 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	285 return m_lexer ? m_lexer->m_reading_script_file : false;
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	286 }
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	287
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	288 class
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	289 terminal_reader : public base_reader
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	290 {
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	291 public:
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	292
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	293 terminal_reader (base_lexer *lxr = nullptr)
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	294 : base_reader (lxr)
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	295 { }
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	296
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	297 std::string get_input (bool& eof);
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	298
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	299 std::string input_source (void) const { return s_in_src; }
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	300
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	301 bool input_from_terminal (void) const { return true; }
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	302
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	303 private:
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	304
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	305 static const std::string s_in_src;
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	306 };
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	307
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	308 class
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	309 file_reader : public base_reader
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	310 {
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	311 public:
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	312
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	313 file_reader (FILE f_arg, base_lexer lxr = nullptr)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	314 : base_reader (lxr), m_file (f_arg) { }
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	315
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	316 std::string get_input (bool& eof);
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	317
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	318 std::string input_source (void) const { return s_in_src; }
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	319
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	320 bool input_from_file (void) const { return true; }
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	321
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	322 private:
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	323
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	324 FILE *m_file;
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	325
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	326 static const std::string s_in_src;
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	327 };
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	328
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	329 class
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	330 eval_string_reader : public base_reader
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	331 {
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	332 public:
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	333
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	334 eval_string_reader (const std::string& str, base_lexer *lxr = nullptr)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	335 : base_reader (lxr), m_eval_string (str)
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	336 { }
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	337
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	338 std::string get_input (bool& eof);
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	339
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	340 std::string input_source (void) const { return s_in_src; }
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	341
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	342 bool input_from_eval_string (void) const { return true; }
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	343
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	344 private:
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	345
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	346 std::string m_eval_string;
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	347
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	348 static const std::string s_in_src;
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	349 };
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	350
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	351 input_reader::input_reader (base_lexer *lxr)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	352 : m_rep (new terminal_reader (lxr))
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	353 { }
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	354
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	355 input_reader::input_reader (FILE file, base_lexer lxr)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	356 : m_rep (new file_reader (file, lxr))
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	357 { }
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	358
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	359 input_reader::input_reader (const std::string& str, base_lexer *lxr)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	360 : m_rep (new eval_string_reader (str, lxr))
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	361 { }
17731 f79bf671a493 eliminate global LEXER variable John W. Eaton <jwe@octave.org> parents: 17323 diff changeset	362 }
f79bf671a493 eliminate global LEXER variable John W. Eaton <jwe@octave.org> parents: 17323 diff changeset	363
581 bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe] jwe parents: 529 diff changeset	364 // Fix things up so that input can come from the standard input. This
bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe] jwe parents: 529 diff changeset	365 // may need to become much more complicated, which is why it's in a
bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe] jwe parents: 529 diff changeset	366 // separate function.
bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe] jwe parents: 529 diff changeset	367
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	368 FILE *
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	369 get_input_from_stdin (void)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	370 {
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	371 octave::command_editor::set_input_stream (stdin);
176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	372 return octave::command_editor::get_input_stream ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	373 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	374
20713 2469d78a1d8b Consistently use 'filename' rather than 'file name' throughout code base. Rik <rik@octave.org> parents: 20704 diff changeset	375 // FIXME: make this generate filenames when appropriate.
2921 64dd86522a1d [project @ 1997-05-02 02:52:54 by jwe] jwe parents: 2900 diff changeset	376
2247 108d848901b4 [project @ 1996-05-22 07:39:29 by jwe] jwe parents: 2235 diff changeset	377 static string_vector
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3519 diff changeset	378 generate_possible_completions (const std::string& text, std::string& prefix,
22171 0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	379 std::string& hint, bool& deemed_struct)
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	380 {
2247 108d848901b4 [project @ 1996-05-22 07:39:29 by jwe] jwe parents: 2235 diff changeset	381 string_vector names;
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	382
2921 64dd86522a1d [project @ 1997-05-02 02:52:54 by jwe] jwe parents: 2900 diff changeset	383 prefix = "";
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	384
22171 0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	385 char prev_char = octave::command_editor::get_prev_char (text.length ());
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	386 deemed_struct = looks_like_struct (text, prev_char);
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	387
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	388 if (deemed_struct)
1430 045e70a15a8f [project @ 1995-09-19 07:05:37 by jwe] jwe parents: 1403 diff changeset	389 names = generate_struct_completions (text, prefix, hint);
045e70a15a8f [project @ 1995-09-19 07:05:37 by jwe] jwe parents: 1403 diff changeset	390 else
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	391 names = octave::make_name_list ();
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	392
2944 e9c24f32f175 [project @ 1997-05-08 02:42:22 by jwe] jwe parents: 2939 diff changeset	393 // Sort and remove duplicates.
2348 a88c5cc51f62 [project @ 1996-07-25 09:54:40 by jwe] jwe parents: 2327 diff changeset	394
8503 8ba2ee57c594 remove qsort in favor of sort Jaroslav Hajek <highegg@gmail.com> parents: 8447 diff changeset	395 names.sort (true);
2348 a88c5cc51f62 [project @ 1996-07-25 09:54:40 by jwe] jwe parents: 2327 diff changeset	396
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	397 return names;
b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	398 }
b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	399
9485 3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	400 static bool
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	401 is_completing_dirfns (void)
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	402 {
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	403 static std::string dirfns_commands[] = {"cd", "ls"};
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	404 static const size_t dirfns_commands_length = 2;
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	405
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	406 bool retval = false;
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	407
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	408 std::string line = octave::command_editor::get_line_buffer ();
9485 3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	409
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	410 for (size_t i = 0; i < dirfns_commands_length; i++)
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	411 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23805 diff changeset	412 int index = line.find (dirfns_commands[i] + ' ');
9485 3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	413
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	414 if (index == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	415 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	416 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	417 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	418 }
9485 3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	419 }
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	420
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	421 return retval;
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	422 }
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	423
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3534 diff changeset	424 static std::string
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3519 diff changeset	425 generate_completion (const std::string& text, int state)
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	426 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3519 diff changeset	427 std::string retval;
2944 e9c24f32f175 [project @ 1997-05-08 02:42:22 by jwe] jwe parents: 2939 diff changeset	428
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3519 diff changeset	429 static std::string prefix;
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3519 diff changeset	430 static std::string hint;
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	431
2921 64dd86522a1d [project @ 1997-05-02 02:52:54 by jwe] jwe parents: 2900 diff changeset	432 static size_t hint_len = 0;
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	433
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	434 static int list_index = 0;
2921 64dd86522a1d [project @ 1997-05-02 02:52:54 by jwe] jwe parents: 2900 diff changeset	435 static int name_list_len = 0;
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4565 diff changeset	436 static int name_list_total_len = 0;
2247 108d848901b4 [project @ 1996-05-22 07:39:29 by jwe] jwe parents: 2235 diff changeset	437 static string_vector name_list;
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4565 diff changeset	438 static string_vector file_name_list;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	439
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	440 static int matches = 0;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	441
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	442 if (state == 0)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	443 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	444 list_index = 0;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	445
2921 64dd86522a1d [project @ 1997-05-02 02:52:54 by jwe] jwe parents: 2900 diff changeset	446 prefix = "";
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	447
2921 64dd86522a1d [project @ 1997-05-02 02:52:54 by jwe] jwe parents: 2900 diff changeset	448 hint = text;
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	449
9485 3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	450 // No reason to display symbols while completing a
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	451 // file/directory operation.
3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	452
22171 0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	453 bool deemed_struct = false;
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	454
9485 3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	455 if (is_completing_dirfns ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	456 name_list = string_vector ();
9485 3cee58bf4acf selectively complete filenames in some cases John W. Eaton <jwe@octave.org> parents: 9484 diff changeset	457 else
22171 0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	458 name_list = generate_possible_completions (text, prefix, hint,
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	459 deemed_struct);
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	460
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20178 diff changeset	461 name_list_len = name_list.numel ();
2921 64dd86522a1d [project @ 1997-05-02 02:52:54 by jwe] jwe parents: 2900 diff changeset	462
22171 0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	463 // If the line was something like "a{1}." then text = "." but
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	464 // we don't want to expand all the . files.
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	465 if (! deemed_struct)
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	466 {
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4565 diff changeset	467
22171 0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	468 file_name_list = octave::command_editor::generate_filename_completions (text);
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	469
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	470 name_list.append (file_name_list);
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	471
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	472 }
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4565 diff changeset	473
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20178 diff changeset	474 name_list_total_len = name_list.numel ();
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4565 diff changeset	475
2921 64dd86522a1d [project @ 1997-05-02 02:52:54 by jwe] jwe parents: 2900 diff changeset	476 hint_len = hint.length ();
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	477
b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	478 matches = 0;
2247 108d848901b4 [project @ 1996-05-22 07:39:29 by jwe] jwe parents: 2235 diff changeset	479
2921 64dd86522a1d [project @ 1997-05-02 02:52:54 by jwe] jwe parents: 2900 diff changeset	480 for (int i = 0; i < name_list_len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	481 if (hint == name_list[i].substr (0, hint_len))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	482 matches++;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	483 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	484
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4565 diff changeset	485 if (name_list_total_len > 0 && matches > 0)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	486 {
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4565 diff changeset	487 while (list_index < name_list_total_len)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	488 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	489 std::string name = name_list[list_index];
2247 108d848901b4 [project @ 1996-05-22 07:39:29 by jwe] jwe parents: 2235 diff changeset	490
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	491 list_index++;
2247 108d848901b4 [project @ 1996-05-22 07:39:29 by jwe] jwe parents: 2235 diff changeset	492
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	493 if (hint == name.substr (0, hint_len))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	494 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	495 // Special case: array reference forces prefix="."
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	496 // in generate_struct_completions ()
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	497 if (list_index <= name_list_len && ! prefix.empty ())
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23805 diff changeset	498 retval = (prefix == "." ? "" : prefix) + '.' + name;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	499 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	500 retval = name;
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	501
22171 0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	502 char prev_char = octave::command_editor::get_prev_char
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	503 (text.length ());
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	504 if (matches == 1 && looks_like_struct (retval, prev_char))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	505 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	506 // Don't append anything, since we don't know
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	507 // whether it should be '(' or '.'.
4179 8734ba917fea [project @ 2002-11-14 04:31:19 by jwe] jwe parents: 4170 diff changeset	508
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	509 octave::command_editor::set_completion_append_character ('\0');
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	510 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	511 else
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	512 octave::command_editor::set_completion_append_character
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	513 (Vcompletion_append_char);
1280 b01f9577b0da [project @ 1995-04-26 17:49:19 by jwe] jwe parents: 1215 diff changeset	514
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	515 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	516 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	517 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	518 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	519
2944 e9c24f32f175 [project @ 1997-05-08 02:42:22 by jwe] jwe parents: 2939 diff changeset	520 return retval;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	521 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	522
6979 2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6945 diff changeset	523 static std::string
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23220 diff changeset	524 quoting_filename (const std::string& text, int, char quote)
6979 2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6945 diff changeset	525 {
2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6945 diff changeset	526 if (quote)
2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6945 diff changeset	527 return text;
2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6945 diff changeset	528 else
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23805 diff changeset	529 return ("'" + text);
6979 2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6945 diff changeset	530 }
2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6945 diff changeset	531
22171 0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	532 // Try to parse a partial command line in reverse, excluding trailing TEXT.
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	533 // If it appears a variable has been indexed by () or {},
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	534 // return that expression,
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	535 // to allow autocomplete of field names of arrays of structures.
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	536 std::string
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	537 find_indexed_expression (const std::string& text)
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	538 {
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	539 std::string line = octave::command_editor::get_line_buffer ();
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	540
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	541 int pos = line.length () - text.length ();
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	542 int curly_count = 0;
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	543 int paren_count = 0;
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	544
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	545 int last = --pos;
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	546
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	547 while (pos >= 0 && (line[pos] == ')' \|\| line[pos] == '}'))
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	548 {
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	549 if (line[pos] == ')')
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	550 paren_count++;
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	551 else if (line[pos] == '}')
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	552 curly_count++;
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	553
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	554 while (curly_count + paren_count > 0 && --pos >= 0)
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	555 {
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	556 if (line[pos] == ')')
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	557 paren_count++;
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	558 else if (line[pos] == '(')
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	559 paren_count--;
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	560 else if (line[pos] == '}')
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	561 curly_count++;
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	562 else if (line[pos] == '{')
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	563 curly_count--;
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	564 }
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	565
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	566 while (--pos >= 0 && line[pos] == ' ')
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	567 ;
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	568 }
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	569
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	570 while (pos >= 0 && (isalnum (line[pos]) \|\| line[pos] == '_'))
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	571 pos--;
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	572
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	573 if (++pos >= 0)
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	574 return (line.substr (pos, last + 1 - pos));
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	575 else
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	576 return std::string ();
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	577 }
0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	578
2927 8722c6284b72 [project @ 1997-05-05 03:44:04 by jwe] jwe parents: 2921 diff changeset	579 void
8722c6284b72 [project @ 1997-05-05 03:44:04 by jwe] jwe parents: 2921 diff changeset	580 initialize_command_input (void)
8722c6284b72 [project @ 1997-05-05 03:44:04 by jwe] jwe parents: 2921 diff changeset	581 {
8722c6284b72 [project @ 1997-05-05 03:44:04 by jwe] jwe parents: 2921 diff changeset	582 // If we are using readline, this allows conditional parsing of the
8722c6284b72 [project @ 1997-05-05 03:44:04 by jwe] jwe parents: 2921 diff changeset	583 // .inputrc file.
269 0febc87abbd4 [project @ 1994-01-05 08:17:07 by jwe] jwe parents: 252 diff changeset	584
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	585 octave::command_editor::set_name ("Octave");
1358 dc9c01f66a19 [project @ 1995-09-05 21:10:01 by jwe] jwe parents: 1352 diff changeset	586
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	587 // FIXME: this needs to include a comma too, but that
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3877 diff changeset	588 // causes trouble for the new struct element completion code.
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3877 diff changeset	589
4272 fd406afe8a10 [project @ 2003-01-03 19:52:30 by jwe] jwe parents: 4253 diff changeset	590 static const char s = "\t\n !\"\'+-/:;<=>(){}[\\]^`~";
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3877 diff changeset	591
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	592 octave::command_editor::set_basic_word_break_characters (s);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3877 diff changeset	593
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	594 octave::command_editor::set_completer_word_break_characters (s);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3877 diff changeset	595
23803 90689bdbe048 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23795 diff changeset	596 octave::command_editor::set_basic_quote_characters (R"(")");
2944 e9c24f32f175 [project @ 1997-05-08 02:42:22 by jwe] jwe parents: 2939 diff changeset	597
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	598 octave::command_editor::set_filename_quote_characters (" \t\n\\\"'@<>=;\|&()#$`?*[!:{");
23805 bf061a189af9 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23804 diff changeset	599 octave::command_editor::set_completer_quote_characters (R"('")");
6979 2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6945 diff changeset	600
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	601 octave::command_editor::set_completion_function (generate_completion);
6979 2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6945 diff changeset	602
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	603 octave::command_editor::set_quoting_function (quoting_filename);
269 0febc87abbd4 [project @ 1994-01-05 08:17:07 by jwe] jwe parents: 252 diff changeset	604 }
0febc87abbd4 [project @ 1994-01-05 08:17:07 by jwe] jwe parents: 252 diff changeset	605
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	606 static void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16433 diff changeset	607 execute_in_debugger_handler (const std::pair<std::string, int>& arg)
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16416 diff changeset	608 {
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16433 diff changeset	609 octave_link::execute_in_debugger_event (arg.first, arg.second);
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16416 diff changeset	610 }
16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16416 diff changeset	611
16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16416 diff changeset	612 static void
23728 b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	613 get_debug_input (octave::interpreter& interp, const std::string& prompt)
269 0febc87abbd4 [project @ 1994-01-05 08:17:07 by jwe] jwe parents: 252 diff changeset	614 {
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21730 diff changeset	615 octave::unwind_protect frame;
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	616
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22171 diff changeset	617 bool silent = octave::tree_evaluator::quiet_breakpoint_flag;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22171 diff changeset	618 octave::tree_evaluator::quiet_breakpoint_flag = false;
19595 be7ac98fab43 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19379 diff changeset	619
23728 b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	620 octave::call_stack& cs = interp.get_call_stack ();
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	621
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	622 octave_user_code *caller = cs.caller_user_code ();
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	623 std::string nm;
18595 a87bdd302b1b set editor cursor on error line when debug_on_error is true (bug #41532) John W. Eaton <jwe@octave.org> parents: 18037 diff changeset	624 int curr_debug_line;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	625
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7758 diff changeset	626 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	627 {
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 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	629
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7758 diff changeset	630 if (nm.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	631 nm = caller->name ();
18595 a87bdd302b1b set editor cursor on error line when debug_on_error is true (bug #41532) John W. Eaton <jwe@octave.org> parents: 18037 diff changeset	632
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	633 curr_debug_line = cs.caller_user_code_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	634 }
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7758 diff changeset	635 else
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	636 curr_debug_line = cs.current_line ();
3180 c17387059fd3 [project @ 1998-09-24 18:59:11 by jwe] jwe parents: 3176 diff changeset	637
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	638 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	639
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7758 diff changeset	640 if (! nm.empty ())
3180 c17387059fd3 [project @ 1998-09-24 18:59:11 by jwe] jwe parents: 3176 diff changeset	641 {
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	642 if (Vgud_mode)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	643 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	644 static char ctrl_z = 'Z' & 0x1f;
269 0febc87abbd4 [project @ 1994-01-05 08:17:07 by jwe] jwe parents: 252 diff changeset	645
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23805 diff changeset	646 buf << ctrl_z << ctrl_z << nm << ':' << curr_debug_line;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	647 }
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7758 diff changeset	648 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	649 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	650 // FIXME: we should come up with a clean way to detect
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	651 // that we are stopped on the no-op command that marks the
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	652 // end of a function or script.
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	653
19379 c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18694 diff changeset	654 if (! silent)
c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18694 diff changeset	655 {
c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18694 diff changeset	656 buf << "stopped in " << nm;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	657
19379 c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18694 diff changeset	658 if (curr_debug_line > 0)
c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18694 diff changeset	659 buf << " at line " << curr_debug_line;
c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18694 diff changeset	660 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	661
25034 6e4121c39957 enable debugging flag and code echo for command-line functions John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	662 octave_link::enter_debugger_event (nm, curr_debug_line);
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	663
25034 6e4121c39957 enable debugging flag and code echo for command-line functions John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	664 octave_link::set_workspace ();
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	665
25034 6e4121c39957 enable debugging flag and code echo for command-line functions John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	666 frame.add_fcn (execute_in_debugger_handler,
6e4121c39957 enable debugging flag and code echo for command-line functions John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	667 std::pair<std::string, int> (nm, curr_debug_line));
16374 8b0a04cbdc9d provide hook function for dbstop events John W. Eaton <jwe@octave.org> parents: 16373 diff changeset	668
25034 6e4121c39957 enable debugging flag and code echo for command-line functions John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	669 if (! silent)
6e4121c39957 enable debugging flag and code echo for command-line functions John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	670 {
6e4121c39957 enable debugging flag and code echo for command-line functions John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	671 std::string line_buf;
23728 b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	672
25034 6e4121c39957 enable debugging flag and code echo for command-line functions John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	673 if (caller)
6e4121c39957 enable debugging flag and code echo for command-line functions John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	674 line_buf = caller->get_code_line (curr_debug_line);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	675
25034 6e4121c39957 enable debugging flag and code echo for command-line functions John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	676 if (! line_buf.empty ())
6e4121c39957 enable debugging flag and code echo for command-line functions John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	677 buf << "\n" << curr_debug_line << ": " << line_buf;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	678 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	679 }
3180 c17387059fd3 [project @ 1998-09-24 18:59:11 by jwe] jwe parents: 3176 diff changeset	680 }
c17387059fd3 [project @ 1998-09-24 18:59:11 by jwe] jwe parents: 3176 diff changeset	681
19379 c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18694 diff changeset	682 if (silent)
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	683 octave::command_editor::erase_empty_line (true);
19595 be7ac98fab43 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19379 diff changeset	684
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7758 diff changeset	685 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	686
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7758 diff changeset	687 if (! msg.empty ())
9484 bbe033dcfe13 make dbwhere work when called at keyboard prompt John W. Eaton <jwe@octave.org> parents: 9483 diff changeset	688 std::cerr << msg << std::endl;
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7758 diff changeset	689
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9999 diff changeset	690 frame.protect_var (VPS1);
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7758 diff changeset	691 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	692
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	693 // FIXME: should debugging be possible in an embedded interpreter?
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	694
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	695 octave::application *app = octave::application::app ();
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	696
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	697 if (! app->interactive ())
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	698 {
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	699
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	700 frame.add_method (app, &octave::application::interactive,
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	701 app->interactive ());
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	702
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	703 frame.add_method (app, &octave::application::forced_interactive,
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	704 app->forced_interactive ());
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	705
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	706 app->interactive (true);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	707
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	708 app->forced_interactive (true);
12907 6e1b9f079e0f allow debugging when input is not coming from a tty John W. Eaton <jwe@octave.org> parents: 12573 diff changeset	709 }
6e1b9f079e0f allow debugging when input is not coming from a tty John W. Eaton <jwe@octave.org> parents: 12573 diff changeset	710
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22171 diff changeset	711 octave::parser curr_parser;
16151 e309eb7940be parser tweaks John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	712
23728 b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	713 octave::tree_evaluator& tw = interp.get_evaluator ();
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	714
12907 6e1b9f079e0f allow debugging when input is not coming from a tty John W. Eaton <jwe@octave.org> parents: 12573 diff changeset	715 while (Vdebugging)
6e1b9f079e0f allow debugging when input is not coming from a tty John W. Eaton <jwe@octave.org> parents: 12573 diff changeset	716 {
20639 31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	717 try
31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	718 {
22164 5d4a286061c8 Track line numbers when in debug mode (bug #45764) Lachlan Andrew <lachlanbis@gmail.com> parents: 22094 diff changeset	719 Vtrack_line_num = false;
5d4a286061c8 Track line numbers when in debug mode (bug #45764) Lachlan Andrew <lachlanbis@gmail.com> parents: 22094 diff changeset	720
20639 31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	721 reset_error_handler ();
12907 6e1b9f079e0f allow debugging when input is not coming from a tty John W. Eaton <jwe@octave.org> parents: 12573 diff changeset	722
20639 31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	723 curr_parser.reset ();
9999 653716f3d976 get_debug_input: force interactive input mode; don't get user input unless stdin is a tty John W. Eaton <jwe@octave.org> parents: 9485 diff changeset	724
20639 31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	725 int retval = curr_parser.run ();
9999 653716f3d976 get_debug_input: force interactive input mode; don't get user input unless stdin is a tty John W. Eaton <jwe@octave.org> parents: 9485 diff changeset	726
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	727 if (octave::command_editor::interrupt (false))
20639 31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	728 break;
31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	729 else
16382 389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16381 diff changeset	730 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	731 if (retval == 0 && curr_parser.m_stmt_list)
20639 31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	732 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	733 curr_parser.m_stmt_list->accept (tw);
9999 653716f3d976 get_debug_input: force interactive input mode; don't get user input unless stdin is a tty John W. Eaton <jwe@octave.org> parents: 9485 diff changeset	734
20639 31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	735 if (octave_completion_matches_called)
31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	736 octave_completion_matches_called = false;
31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	737 }
31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	738
31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	739 octave_quit ();
16382 389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16381 diff changeset	740 }
20639 31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	741 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	742 catch (const octave::execution_exception& e)
20639 31219c56874f don't exit debugger if an error occurs (bug #46251) John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	743 {
20739 9e8a6d6d6de9 restore stack trace for errors that occur in debug mode John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	744 std::string stack_trace = e.info ();
9e8a6d6d6de9 restore stack trace for errors that occur in debug mode John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	745
9e8a6d6d6de9 restore stack trace for errors that occur in debug mode John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	746 if (! stack_trace.empty ())
9e8a6d6d6de9 restore stack trace for errors that occur in debug mode John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	747 std::cerr << stack_trace;
9e8a6d6d6de9 restore stack trace for errors that occur in debug mode John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	748
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	749 // Ignore errors when in debugging mode;
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	750 octave::interpreter::recover_from_exception ();
9999 653716f3d976 get_debug_input: force interactive input mode; don't get user input unless stdin is a tty John W. Eaton <jwe@octave.org> parents: 9485 diff changeset	751 }
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 }
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	753 }
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	754
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	755 namespace octave
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	756 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	757 const std::string base_reader::s_in_src ("invalid");
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	758
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	759 const std::string terminal_reader::s_in_src ("terminal");
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	760
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	761 std::string
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	762 terminal_reader::get_input (bool& eof)
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	763 {
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	764 octave_quit ();
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	765
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	766 eof = false;
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	767
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	768 return octave_gets (eof);
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	769 }
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	770
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	771 const std::string file_reader::s_in_src ("file");
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	772
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	773 std::string
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	774 file_reader::get_input (bool& eof)
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	775 {
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	776 octave_quit ();
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	777
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	778 eof = false;
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	779
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	780 return octave_fgets (m_file, eof);
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	781 }
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	782
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	783 const std::string eval_string_reader::s_in_src ("eval_string");
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	784
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	785 std::string
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	786 eval_string_reader::get_input (bool& eof)
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	787 {
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	788 octave_quit ();
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	789
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	790 eof = false;
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	791
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	792 std::string retval;
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	793
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	794 retval = m_eval_string;
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	795
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	796 // Clear the eval string so that the next call will return
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	797 // an empty character string with EOF = true.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	798 m_eval_string = "";
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	799
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	800 if (retval.empty ())
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	801 eof = true;
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	802
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	803 return retval;
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	804 }
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	805 }
b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	806
581 bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe] jwe parents: 529 diff changeset	807 // If the user simply hits return, this will produce an empty matrix.
bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe] jwe parents: 529 diff changeset	808
2086 bfb775fb6fe8 [project @ 1996-04-25 05:55:19 by jwe] jwe parents: 1996 diff changeset	809 static octave_value_list
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7734 diff changeset	810 get_user_input (const octave_value_list& args, int nargout)
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	811 {
3100 bea2f5be3eab [project @ 1997-11-14 10:07:50 by jwe] jwe parents: 3098 diff changeset	812 octave_value_list retval;
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	813
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	814 int read_as_string = 0;
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	815
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20817 diff changeset	816 if (args.length () == 2)
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	817 read_as_string++;
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	818
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20639 diff changeset	819 std::string prompt = args(0).xstring_value ("input: unrecognized argument");
4975 80842ad3f85c [project @ 2004-09-08 18:37:58 by jwe] jwe parents: 4802 diff changeset	820
23060 baf03cdb28b5 move pager and diary classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	821 octave::flush_stdout ();
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	822
23060 baf03cdb28b5 move pager and diary classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	823 octave::pager_stream::reset ();
baf03cdb28b5 move pager and diary classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	824 octave::diary_stream::reset ();
13266 c053740eb2aa improve memory use for the pager and diary streams (bug #34431) John W. Eaton <jwe@octave.org> parents: 12989 diff changeset	825
4565 1db951a4fcd5 [project @ 2003-10-29 13:49:30 by jwe] jwe parents: 4526 diff changeset	826 octave_diary << prompt;
1db951a4fcd5 [project @ 2003-10-29 13:49:30 by jwe] jwe parents: 4526 diff changeset	827
16198 2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	828 bool eof = false;
2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	829
2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	830 std::string input_buf = interactive_input (prompt.c_str (), eof);
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	831
20981 c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	832 if (input_buf.empty ())
c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	833 error ("input: reading user-input failed!");
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	834
20981 c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	835 size_t len = input_buf.length ();
4565 1db951a4fcd5 [project @ 2003-10-29 13:49:30 by jwe] jwe parents: 4526 diff changeset	836
20981 c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	837 octave_diary << input_buf;
4565 1db951a4fcd5 [project @ 2003-10-29 13:49:30 by jwe] jwe parents: 4526 diff changeset	838
20981 c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	839 if (input_buf[len - 1] != '\n')
c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	840 octave_diary << "\n";
3772 e44ffad3d06c [project @ 2001-02-03 06:23:38 by jwe] jwe parents: 3741 diff changeset	841
20981 c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	842 if (len < 1)
c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	843 return read_as_string ? octave_value ("") : octave_value (Matrix ());
c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	844
c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	845 if (read_as_string)
c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	846 {
c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	847 // FIXME: fix gnu_readline and octave_gets instead!
c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	848 if (input_buf.length () == 1 && input_buf[0] == '\n')
c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	849 retval(0) = "";
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	850 else
20981 c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	851 retval(0) = input_buf;
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	852 }
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	853 else
20981 c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	854 {
c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	855 int parse_status = 0;
c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	856
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	857 retval = octave::eval_string (input_buf, true, parse_status, nargout);
20981 c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	858
21885 0806871e3e1e maint: Prefer is_empty() rather than "length () == 0". Rik <rik@octave.org> parents: 21852 diff changeset	859 if (! Vdebugging && retval.empty ())
20981 c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	860 retval(0) = Matrix ();
c11cea70b638 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	861 }
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	862
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	863 return retval;
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	864 }
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	865
3100 bea2f5be3eab [project @ 1997-11-14 10:07:50 by jwe] jwe parents: 3098 diff changeset	866 DEFUN (input, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	867 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	868 @deftypefn {} {@var{ans} =} input (@var{prompt})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	869 @deftypefnx {} {@var{ans} =} input (@var{prompt}, "s")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	870 Print @var{prompt} and wait for user input.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	871
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	872 For example,
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	873
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	874 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	875 input ("Pick a number, any number! ")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	876 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	877
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	878 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	879 prints the prompt
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	880
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	881 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	882 Pick a number, any number!
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	883 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	884
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	885 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	886 and waits for the user to enter a value. The string entered by the user
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	887 is evaluated as an expression, so it may be a literal constant, a variable
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	888 name, or any other valid Octave code.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	889
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	890 The number of return arguments, their size, and their class depend on the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	891 expression entered.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	892
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	893 If you are only interested in getting a literal string value, you can call
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	894 @code{input} with the character string @qcode{"s"} as the second argument.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	895 This tells Octave to return the string entered by the user directly, without
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	896 evaluating it first.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	897
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	898 Because there may be output waiting to be displayed by the pager, it is a
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	899 good idea to always call @code{fflush (stdout)} before calling @code{input}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	900 This will ensure that all pending output is written to the screen before
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	901 your prompt.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	902 @seealso{yes_or_no, kbhit, pause, menu, listdlg}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	903 @end deftypefn */)
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	904 {
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	905 int nargin = args.length ();
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	906
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	907 if (nargin < 1 \|\| nargin > 2)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	908 print_usage ();
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	909
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	910 return get_user_input (args, std::max (nargout, 1));
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	911 }
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	912
5640 426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	913 bool
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	914 octave_yes_or_no (const std::string& prompt)
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	915 {
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	916 std::string prompt_string = prompt + "(yes or no) ";
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	917
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	918 while (1)
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	919 {
16198 2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	920 bool eof = false;
2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	921
2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	922 std::string input_buf = interactive_input (prompt_string, eof);
5640 426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	923
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	924 if (input_buf == "yes")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	925 return true;
5640 426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	926 else if (input_buf == "no")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	927 return false;
5640 426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	928 else
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23728 diff changeset	929 message (nullptr, "Please answer yes or no.");
5640 426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	930 }
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	931 }
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	932
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	933 DEFUN (yes_or_no, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	934 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	935 @deftypefn {} {@var{ans} =} yes_or_no ("@var{prompt}")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	936 Ask the user a yes-or-no question.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	937
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	938 Return logical true if the answer is yes or false if the answer is no.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	939
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	940 Takes one argument, @var{prompt}, which is the string to display when asking
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	941 the question. @var{prompt} should end in a space; @code{yes-or-no} adds the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	942 string @samp{(yes or no) } to it. The user must confirm the answer with
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	943 @key{RET} and can edit it until it has been confirmed.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	944 @seealso{input}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	945 @end deftypefn */)
5640 426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	946 {
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	947 int nargin = args.length ();
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	948
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	949 if (nargin > 1)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	950 print_usage ();
5640 426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	951
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	952 std::string prompt;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	953
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	954 if (nargin == 1)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	955 prompt = args(0).xstring_value ("yes_or_no: PROMPT must be a string");
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	956
21127 df7891224709 maint: Use "return ovl (...)" in DEFUN macros. Rik <rik@octave.org> parents: 21100 diff changeset	957 return ovl (octave_yes_or_no (prompt));
5640 426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	958 }
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	959
3707 58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	960 octave_value
23728 b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	961 do_keyboard (octave::interpreter& interp, const octave_value_list& args)
3707 58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	962 {
58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	963 octave_value retval;
58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	964
58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	965 int nargin = args.length ();
58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	966
58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	967 assert (nargin == 0 \|\| nargin == 1);
58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	968
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21730 diff changeset	969 octave::unwind_protect frame;
3707 58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	970
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	971 frame.add_fcn (octave::command_history::ignore_entries,
176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	972 octave::command_history::ignoring_entries ());
12989 00235a6446da eliminate duplication of internal variables controlling command history John W. Eaton <jwe@octave.org> parents: 12942 diff changeset	973
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	974 octave::command_history::ignore_entries (false);
3707 58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	975
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9999 diff changeset	976 frame.protect_var (Vdebugging);
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7734 diff changeset	977
23728 b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	978 octave::call_stack& cs = interp.get_call_stack ();
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	979
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	980 frame.add_method (cs, &octave::call_stack::restore_frame,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	981 cs.current_frame ());
3707 58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	982
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	983 // FIXME: probably we just want to print one line, not the
9484 bbe033dcfe13 make dbwhere work when called at keyboard prompt John W. Eaton <jwe@octave.org> parents: 9483 diff changeset	984 // entire statement, which might span many lines...
bbe033dcfe13 make dbwhere work when called at keyboard prompt John W. Eaton <jwe@octave.org> parents: 9483 diff changeset	985 //
bbe033dcfe13 make dbwhere work when called at keyboard prompt John W. Eaton <jwe@octave.org> parents: 9483 diff changeset	986 // tree_print_code tpc (octave_stdout);
bbe033dcfe13 make dbwhere work when called at keyboard prompt John W. Eaton <jwe@octave.org> parents: 9483 diff changeset	987 // stmt.accept (tpc);
bbe033dcfe13 make dbwhere work when called at keyboard prompt John W. Eaton <jwe@octave.org> parents: 9483 diff changeset	988
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7734 diff changeset	989 Vdebugging = true;
22164 5d4a286061c8 Track line numbers when in debug mode (bug #45764) Lachlan Andrew <lachlanbis@gmail.com> parents: 22094 diff changeset	990 Vtrack_line_num = false;
3707 58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	991
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	992 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	993 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	994 prompt = args(0).string_value ();
4233 ccfdb55c8156 [project @ 2002-12-20 22:43:54 by jwe] jwe parents: 4208 diff changeset	995
23728 b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	996 get_debug_input (interp, prompt);
3707 58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	997
58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	998 return retval;
58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	999 }
58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3566 diff changeset	1000
23728 b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1001 octave_value
b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1002 do_keyboard (const octave_value_list& args)
b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1003 {
b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1004 octave::interpreter& interp = octave::__get_interpreter__ ("do_keyboard");
b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1005
b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1006 return do_keyboard (interp, args);
b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1007 }
b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1008
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1009 DEFMETHOD (keyboard, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1010 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1011 @deftypefn {} {} keyboard ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1012 @deftypefnx {} {} keyboard ("@var{prompt}")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1013 Stop m-file execution and enter debug mode.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1014
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1015 When the @code{keyboard} function is executed, Octave prints a prompt and
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1016 waits for user input. The input strings are then evaluated and the results
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1017 are printed. This makes it possible to examine the values of variables
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1018 within a function, and to assign new values if necessary. To leave the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1019 prompt and return to normal execution type @samp{return} or @samp{dbcont}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1020 The @code{keyboard} function does not return an exit status.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1021
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1022 If @code{keyboard} is invoked without arguments, a default prompt of
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1023 @samp{debug> } is used.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1024 @seealso{dbstop, dbcont, dbquit}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1025 @end deftypefn */)
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	1026 {
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20817 diff changeset	1027 if (args.length () > 1)
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1028 print_usage ();
10186 095a1e670e68 make dbstep work with keyboard function John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1029
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21730 diff changeset	1030 octave::unwind_protect frame;
9483 25c2e92ee03c correctly skip frame assigned to keyboard function John W. Eaton <jwe@octave.org> parents: 9482 diff changeset	1031
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1032 octave::call_stack& cs = interp.get_call_stack ();
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1033
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1034 frame.add_method (cs, &octave::call_stack::restore_frame,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1035 cs.current_frame ());
9483 25c2e92ee03c correctly skip frame assigned to keyboard function John W. Eaton <jwe@octave.org> parents: 9482 diff changeset	1036
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1037 // Skip the frame assigned to the keyboard function.
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1038 cs.goto_frame_relative (0);
10186 095a1e670e68 make dbstep work with keyboard function John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1039
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22171 diff changeset	1040 octave::tree_evaluator::debug_mode = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22171 diff changeset	1041 octave::tree_evaluator::quiet_breakpoint_flag = false;
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1042
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1043 octave::tree_evaluator::current_frame = cs.current_frame ();
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1044
23728 b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1045 do_keyboard (interp, args);
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	1046
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20940 diff changeset	1047 return ovl ();
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	1048 }
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	1049
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1050 DEFUN (completion_matches, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1051 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1052 @deftypefn {} {} completion_matches (@var{hint})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1053 Generate possible completions given @var{hint}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1054
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1055 This function is provided for the benefit of programs like Emacs which
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1056 might be controlling Octave and handling user input. The current
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1057 command number is not incremented when this function is called. This is
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1058 a feature, not a bug.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1059 @end deftypefn */)
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1060 {
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20817 diff changeset	1061 if (args.length () != 1)
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1062 print_usage ();
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1063
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1064 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1065
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1066 std::string hint = args(0).string_value ();
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1067
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1068 int n = 32;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1069
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1070 string_vector list (n);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20239 diff changeset	1071
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1072 int k = 0;
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1073
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1074 for (;;)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1075 {
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1076 std::string cmd = generate_completion (hint, k);
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1077
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1078 if (! cmd.empty ())
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20239 diff changeset	1079 {
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1080 if (k == n)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	1081 {
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1082 n *= 2;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1083 list.resize (n);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	1084 }
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1085
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1086 list[k++] = cmd;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20239 diff changeset	1087 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20239 diff changeset	1088 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20239 diff changeset	1089 {
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1090 list.resize (k);
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1091 break;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1092 }
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1093 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20239 diff changeset	1094
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1095 if (nargout > 0)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1096 {
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1097 if (! list.empty ())
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1098 retval = list;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1099 else
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1100 retval = "";
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1101 }
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1102 else
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1103 {
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1104 // We don't use string_vector::list_in_columns here
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1105 // because it will be easier for Emacs if the names
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1106 // appear in a single column.
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1107
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1108 int len = list.numel ();
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1109
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1110 for (int i = 0; i < len; i++)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1111 octave_stdout << list[i] << "\n";
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1112 }
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1113
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1114 octave_completion_matches_called = true;
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1115
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1116 return retval;
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1117 }
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1118
20239 48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1119 /*
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1120 %!assert (ischar (completion_matches ("")))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1121 %!assert (ischar (completion_matches ("a")))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1122 %!assert (ischar (completion_matches (" ")))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1123 %!assert (isempty (completion_matches (" ")))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1124 %!assert (any (strcmp ("abs", deblank (cellstr (completion_matches (""))))))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1125 %!assert (any (strcmp ("abs", deblank (cellstr (completion_matches ("a"))))))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1126 %!assert (any (strcmp ("abs", deblank (cellstr (completion_matches ("ab"))))))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1127 %!assert (any (strcmp ("abs", deblank (cellstr (completion_matches ("abs"))))))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1128 %!assert (! any (strcmp ("abs", deblank (cellstr (completion_matches ("absa"))))))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1129
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1130 %!error completion_matches ()
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1131 %!error completion_matches (1, 2)
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1132 */
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1133
16879 cc3743a91652 Rename read_readline_init_file to readline_read_init_file. Rik <rik@octave.org> parents: 16816 diff changeset	1134 DEFUN (readline_read_init_file, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1135 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1136 @deftypefn {} {} readline_read_init_file (@var{file})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1137 Read the readline library initialization file @var{file}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1138
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1139 If @var{file} is omitted, read the default initialization file
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1140 (normally @file{~/.inputrc}).
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1141
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1142 @xref{Readline Init File, , , readline, GNU Readline Library},
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1143 for details.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1144 @seealso{readline_re_read_init_file}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1145 @end deftypefn */)
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1146 {
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1147 int nargin = args.length ();
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1148
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1149 if (nargin > 1)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1150 print_usage ();
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1151
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1152 if (nargin == 0)
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	1153 octave::command_editor::read_init_file ();
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1154 else
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1155 {
5872 44f24cf66b95 [project @ 2006-06-30 18:19:20 by jwe] jwe parents: 5832 diff changeset	1156 std::string file = args(0).string_value ();
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1157
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	1158 octave::command_editor::read_init_file (file);
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1159 }
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1160
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20940 diff changeset	1161 return ovl ();
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1162 }
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1163
16880 1aebb613a5ac Rename re_read_readline_init_file to readline_re_read_init_file. Rik <rik@octave.org> parents: 16879 diff changeset	1164 DEFUN (readline_re_read_init_file, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1165 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1166 @deftypefn {} {} readline_re_read_init_file ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1167 Re-read the last readline library initialization file that was read.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1168
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1169 @xref{Readline Init File, , , readline, GNU Readline Library},
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1170 for details.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1171 @seealso{readline_read_init_file}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1172 @end deftypefn */)
7758 8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1173 {
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1174 if (args.length () != 0)
7758 8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1175 print_usage ();
8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1176
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	1177 octave::command_editor::re_read_init_file ();
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1178
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20940 diff changeset	1179 return ovl ();
7758 8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1180 }
8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1181
16349 610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	1182 static int
610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	1183 internal_input_event_hook_fcn (void)
610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	1184 {
16378 b28ae106e316 use class for lists of input hook functions John W. Eaton <jwe@octave.org> parents: 16374 diff changeset	1185 input_event_hook_functions.run ();
16349 610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	1186
16378 b28ae106e316 use class for lists of input hook functions John W. Eaton <jwe@octave.org> parents: 16374 diff changeset	1187 if (input_event_hook_functions.empty ())
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	1188 octave::command_editor::remove_event_hook (internal_input_event_hook_fcn);
16152 c48847a781d5 * input.cc (input_event_hook): Return 0. John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	1189
c48847a781d5 * input.cc (input_event_hook): Return 0. John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	1190 return 0;
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1191 }
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1192
9215 1500d0197484 allow multiple input event hook functions to be installed simultaneously John W. Eaton <jwe@octave.org> parents: 9134 diff changeset	1193 DEFUN (add_input_event_hook, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1194 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1195 @deftypefn {} {@var{id} =} add_input_event_hook (@var{fcn})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1196 @deftypefnx {} {@var{id} =} add_input_event_hook (@var{fcn}, @var{data})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1197 Add the named function or function handle @var{fcn} to the list of functions
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1198 to call periodically when Octave is waiting for input.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1199
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1200 The function should have the form
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1201
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1202 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1203 @var{fcn} (@var{data})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1204 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1205
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1206 If @var{data} is omitted, Octave calls the function without any arguments.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1207
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1208 The returned identifier may be used to remove the function handle from the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1209 list of input hook functions.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1210 @seealso{remove_input_event_hook}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1211 @end deftypefn */)
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1212 {
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1213 int nargin = args.length ();
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1214
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1215 if (nargin < 1 \|\| nargin > 2)
9215 1500d0197484 allow multiple input event hook functions to be installed simultaneously John W. Eaton <jwe@octave.org> parents: 9134 diff changeset	1216 print_usage ();
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1217
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1218 octave_value user_data;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1219
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1220 if (nargin == 2)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1221 user_data = args(1);
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1222
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1223 hook_function hook_fcn (args(0), user_data);
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1224
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1225 if (input_event_hook_functions.empty ())
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	1226 octave::command_editor::add_event_hook (internal_input_event_hook_fcn);
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1227
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1228 input_event_hook_functions.insert (hook_fcn.id (), hook_fcn);
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1229
21127 df7891224709 maint: Use "return ovl (...)" in DEFUN macros. Rik <rik@octave.org> parents: 21100 diff changeset	1230 return ovl (hook_fcn.id ());
9215 1500d0197484 allow multiple input event hook functions to be installed simultaneously John W. Eaton <jwe@octave.org> parents: 9134 diff changeset	1231 }
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1232
9215 1500d0197484 allow multiple input event hook functions to be installed simultaneously John W. Eaton <jwe@octave.org> parents: 9134 diff changeset	1233 DEFUN (remove_input_event_hook, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1234 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1235 @deftypefn {} {} remove_input_event_hook (@var{name})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1236 @deftypefnx {} {} remove_input_event_hook (@var{fcn_id})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1237 Remove the named function or function handle with the given identifier
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1238 from the list of functions to call periodically when Octave is waiting
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1239 for input.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1240 @seealso{add_input_event_hook}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1241 @end deftypefn */)
9215 1500d0197484 allow multiple input event hook functions to be installed simultaneously John W. Eaton <jwe@octave.org> parents: 9134 diff changeset	1242 {
1500d0197484 allow multiple input event hook functions to be installed simultaneously John W. Eaton <jwe@octave.org> parents: 9134 diff changeset	1243 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	1244
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1245 if (nargin < 1 \|\| nargin > 2)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1246 print_usage ();
16347 bf8397caeff1 allow add_input_event_hook to accept function handles John W. Eaton <jwe@octave.org> parents: 16336 diff changeset	1247
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1248 std::string hook_fcn_id = args(0).string_value ("remove_input_event_hook: argument not valid as a hook function name or id");
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1249
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1250 bool warn = (nargin < 2);
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1251
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1252 hook_function_list::iterator p
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1253 = input_event_hook_functions.find (hook_fcn_id);
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1254
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1255 if (p != input_event_hook_functions.end ())
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1256 input_event_hook_functions.erase (p);
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1257 else if (warn)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1258 warning ("remove_input_event_hook: %s not found in list",
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1259 hook_fcn_id.c_str ());
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1260
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1261 if (input_event_hook_functions.empty ())
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	1262 octave::command_editor::remove_event_hook (internal_input_event_hook_fcn);
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1263
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20940 diff changeset	1264 return ovl ();
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1265 }
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1266
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1267 DEFUN (PS1, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1268 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1269 @deftypefn {} {@var{val} =} PS1 ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1270 @deftypefnx {} {@var{old_val} =} PS1 (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1271 @deftypefnx {} {} PS1 (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1272 Query or set the primary prompt string.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1273
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1274 When executing interactively, Octave displays the primary prompt when it is
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1275 ready to read a command.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1276
24595 5ed2e9248ee9 doc: Tweaks to use single quotes instead of double quotes (bug #52870). Rik <rik@octave.org> parents: 23219 diff changeset	1277 The default value of the primary prompt string is @qcode{'octave:\#> '}.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1278 To change it, use a command like
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1279
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1280 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1281 PS1 ("\\u@@\\H> ")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1282 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1283
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1284 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1285 which will result in the prompt @samp{boris@@kremvax> } for the user
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1286 @samp{boris} logged in on the host @samp{kremvax.kgb.su}. Note that two
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1287 backslashes are required to enter a backslash into a double-quoted
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1288 character string. @xref{Strings}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1289
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1290 You can also use ANSI escape sequences if your terminal supports them.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1291 This can be useful for coloring the prompt. For example,
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1292
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1293 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1294 PS1 ('\[\033[01;31m\]\s:\#> \[\033[0m\]')
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1295 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1296
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1297 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1298 will give the default Octave prompt a red coloring.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1299
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1300 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1301 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1302 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1303 @seealso{PS2, PS4}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1304 @end deftypefn */)
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1305 {
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1306 return SET_INTERNAL_VARIABLE (PS1);
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1307 }
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2114 diff changeset	1308
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1309 DEFUN (PS2, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1310 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1311 @deftypefn {} {@var{val} =} PS2 ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1312 @deftypefnx {} {@var{old_val} =} PS2 (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1313 @deftypefnx {} {} PS2 (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1314 Query or set the secondary prompt string.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1315
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1316 The secondary prompt is printed when Octave is expecting additional input to
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1317 complete a command. For example, if you are typing a @code{for} loop that
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1318 spans several lines, Octave will print the secondary prompt at the beginning
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1319 of each line after the first. The default value of the secondary prompt
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1320 string is @qcode{"> "}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1321
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1322 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1323 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1324 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1325 @seealso{PS1, PS4}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1326 @end deftypefn */)
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1327 {
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1328 return SET_INTERNAL_VARIABLE (PS2);
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1329 }
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2114 diff changeset	1330
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1331 DEFUN (completion_append_char, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1332 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1333 @deftypefn {} {@var{val} =} completion_append_char ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1334 @deftypefnx {} {@var{old_val} =} completion_append_char (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1335 @deftypefnx {} {} completion_append_char (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1336 Query or set the internal character variable that is appended to
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1337 successful command-line completion attempts.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1338
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1339 The default value is @qcode{" "} (a single space).
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1340
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1341 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1342 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1343 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1344 @end deftypefn */)
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1345 {
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1346 return SET_INTERNAL_VARIABLE (completion_append_char);
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1347 }
3019 92aa3d651723 [project @ 1997-06-03 22:07:16 by jwe] jwe parents: 3016 diff changeset	1348
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1349 DEFUN (__request_drawnow__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1350 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1351 @deftypefn {} {} __request_drawnow__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1352 @deftypefnx {} {} __request_drawnow__ (@var{flag})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1353 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1354 @end deftypefn */)
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1355 {
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1356 int nargin = args.length ();
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1357
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1358 if (nargin > 1)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1359 print_usage ();
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1360
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1361 if (nargin == 0)
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1362 Vdrawnow_requested = true;
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1363 else
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1364 Vdrawnow_requested = args(0).bool_value ();
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1365
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20940 diff changeset	1366 return ovl ();
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1367 }
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1368
7294 fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1369 DEFUN (__gud_mode__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1370 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1371 @deftypefn {} {} __gud_mode__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1372 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1373 @end deftypefn */)
7294 fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1374 {
fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1375 int nargin = args.length ();
fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1376
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1377 if (nargin > 1)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1378 print_usage ();
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1379
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1380 octave_value_list retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1381
7294 fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1382 if (nargin == 0)
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1383 retval = ovl (Vgud_mode);
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1384 else
7294 fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1385 Vgud_mode = args(0).bool_value ();
fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1386
21006 ea779f11deae strip trailing whitespace from files John W. Eaton <jwe@octave.org> parents: 20996 diff changeset	1387 return retval;
7294 fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1388 }

Mercurial > octave

annotate libinterp/corefcn/input.cc @ 26061:cb3ead3cf859 stable