octave: libinterp/corefcn/input.cc annotate

annotate libinterp/corefcn/input.cc @ 27428:e94868c1369f

Increment command number even when command is interrupted. (bug #55819). * input.cc (base_reader::octave_gets): Add call to command number increment if not in debug repl. * pt-eval.cc (tree_evaluator::repl): remove call to command number increment

author	Anthony Morast <anthony.a.morast@gmail.com>
date	Thu, 13 Jun 2019 08:00:41 -0600
parents	9b19eec60931
children	160930a3e5ee

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
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26358 diff changeset	3 Copyright (C) 1993-2019 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"
25361 82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	40 #include "iconv-wrappers.h"
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	41 #include "localcharset-wrapper.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4143 diff changeset	42 #include "quit.h"
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1750 diff changeset	43 #include "str-vec.h"
25361 82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	44 #include "uniconv-wrappers.h"
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1750 diff changeset	45
23129 35e3d199527c Replace feval calls with direct call to C++ function (bug #50116). Rik <rik@octave.org> parents: 23127 diff changeset	46 #include "builtin-defun-decls.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1350 diff changeset	47 #include "defun.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"
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	50 #include "event-manager.h"
3016 f512c16826d1 [project @ 1997-06-03 03:16:13 by jwe] jwe parents: 3014 diff changeset	51 #include "help.h"
16381 f33dcbd6a005 move hook_function classes to separate file John W. Eaton <jwe@octave.org> parents: 16378 diff changeset	52 #include "hook-fcn.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	53 #include "input.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	54 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22091 diff changeset	55 #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	56 #include "lex.h"
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: 5823 diff changeset	57 #include "load-path.h"
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22051 diff changeset	58 #include "octave.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"
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	62 #include "event-manager.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
3165 e4bbfc196e53 [project @ 1998-04-16 03:01:47 by jwe] jwe parents: 3100 diff changeset	77 // 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	78 octave::sys::time Vlast_prompt_time = 0.0;
3165 e4bbfc196e53 [project @ 1998-04-16 03:01:47 by jwe] jwe parents: 3100 diff changeset	79
3804 4073be5aefa1 [project @ 2001-02-28 08:36:04 by jwe] jwe parents: 3772 diff changeset	80 // TRUE after a call to completion_matches.
2299 f296bbc757a1 [project @ 1996-06-23 03:45:44 by jwe] jwe parents: 2287 diff changeset	81 bool octave_completion_matches_called = false;
f296bbc757a1 [project @ 1996-06-23 03:45:44 by jwe] jwe parents: 2287 diff changeset	82
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	83 // 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	84 // the next user prompt.
7409 73036cdd855d [project @ 2008-01-22 20:31:59 by jwe] jwe parents: 7336 diff changeset	85 bool Vdrawnow_requested = false;
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	86
22164 5d4a286061c8 Track line numbers when in debug mode (bug #45764) Lachlan Andrew <lachlanbis@gmail.com> parents: 22094 diff changeset	87 // 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	88 // 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	89 // the terminal.
5d4a286061c8 Track line numbers when in debug mode (bug #45764) Lachlan Andrew <lachlanbis@gmail.com> parents: 22094 diff changeset	90 bool Vtrack_line_num = true;
5d4a286061c8 Track line numbers when in debug mode (bug #45764) Lachlan Andrew <lachlanbis@gmail.com> parents: 22094 diff changeset	91
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	92 namespace octave
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	93 {
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	94 static std::string
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	95 quoting_filename (const std::string& text, int, char quote)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	96 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	97 if (quote)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	98 return text;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	99 else
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	100 return ("'" + text);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	101 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	102
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	103 // Try to parse a partial command line in reverse, excluding trailing TEXT.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	104 // If it appears a variable has been indexed by () or {},
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	105 // return that expression,
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	106 // to allow autocomplete of field names of arrays of structures.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	107 static std::string
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	108 find_indexed_expression (const std::string& text)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	109 {
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	110 std::string line = command_editor::get_line_buffer ();
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	111
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	112 int pos = line.length () - text.length ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	113 int curly_count = 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	114 int paren_count = 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	115
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	116 int last = --pos;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	117
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	118 while (pos >= 0 && (line[pos] == ')' \|\| line[pos] == '}'))
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	119 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	120 if (line[pos] == ')')
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	121 paren_count++;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	122 else
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	123 curly_count++;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	124
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	125 while (curly_count + paren_count > 0 && --pos >= 0)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	126 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	127 if (line[pos] == ')')
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	128 paren_count++;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	129 else if (line[pos] == '(')
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	130 paren_count--;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	131 else if (line[pos] == '}')
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	132 curly_count++;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	133 else if (line[pos] == '{')
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	134 curly_count--;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	135 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	136
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	137 while (--pos >= 0 && line[pos] == ' ')
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	138 ;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	139 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	140
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	141 while (pos >= 0 && (isalnum (line[pos]) \|\| line[pos] == '_'))
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	142 pos--;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	143
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	144 if (++pos >= 0)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	145 return (line.substr (pos, last + 1 - pos));
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	146 else
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	147 return std::string ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	148 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	149
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	150 static string_vector
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	151 generate_struct_completions (const std::string& text,
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	152 std::string& prefix, std::string& hint)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	153 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	154 string_vector names;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	155
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	156 size_t pos = text.rfind ('.');
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	157 bool array = false;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	158
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	159 if (pos != std::string::npos)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	160 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	161 if (pos == text.length ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	162 hint = "";
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	163 else
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	164 hint = text.substr (pos+1);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	165
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	166 prefix = text.substr (0, pos);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	167
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	168 if (prefix == "")
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	169 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	170 array = true;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	171 prefix = find_indexed_expression (text);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	172 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	173
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	174 std::string base_name = prefix;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	175
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	176 pos = base_name.find_first_of ("{(. ");
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	177
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	178 if (pos != std::string::npos)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	179 base_name = base_name.substr (0, pos);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	180
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	181 interpreter& interp
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	182 = __get_interpreter__ ("generate_struct_completions");
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	183
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	184 if (interp.is_variable (base_name))
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	185 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	186 int parse_status;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	187
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	188 error_system& es = interp.get_error_system ();
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	189
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	190 unwind_protect frame;
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	191
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	192 frame.add_method (es, &error_system::set_discard_error_messages,
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	193 es.discard_error_messages ());
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	194 frame.add_method (es, &error_system::set_discard_warning_messages,
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	195 es.discard_warning_messages ());
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	196
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	197 es.discard_error_messages (true);
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	198 es.discard_warning_messages (true);
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	199
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	200 try
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	201 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	202 octave_value tmp
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	203 = interp.eval_string (prefix, true, parse_status);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	204
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	205 frame.run ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	206
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	207 if (tmp.is_defined ()
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	208 && (tmp.isstruct () \|\| tmp.isjava () \|\| tmp.is_classdef_object ()))
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	209 names = tmp.map_keys ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	210 }
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	211 catch (const execution_exception&)
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	212 {
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	213 interpreter::recover_from_exception ();
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	214 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	215 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	216 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	217
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	218 // Undo look-back that found the array expression,
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	219 // but insert an extra "." to distinguish from the non-struct case.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	220 if (array)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	221 prefix = ".";
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	222
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	223 return names;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	224 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	225
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	226 // FIXME: this will have to be much smarter to work "correctly".
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	227 static bool
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	228 looks_like_struct (const std::string& text, char prev_char)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	229 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	230 bool retval = (! text.empty ()
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	231 && (text != "." \|\| prev_char == ')' \|\| prev_char == '}')
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	232 && text.find_first_of (sys::file_ops::dir_sep_chars ()) == std::string::npos
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	233 && text.find ("..") == std::string::npos
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	234 && text.rfind ('.') != std::string::npos);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	235
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	236 return retval;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	237 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	238
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	239 // FIXME: make this generate filenames when appropriate.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	240
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	241 static string_vector
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	242 generate_possible_completions (const std::string& text, std::string& prefix,
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	243 std::string& hint, bool& deemed_struct)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	244 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	245 string_vector names;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	246
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	247 prefix = "";
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	248
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	249 char prev_char = command_editor::get_prev_char (text.length ());
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	250 deemed_struct = looks_like_struct (text, prev_char);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	251
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	252 if (deemed_struct)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	253 names = generate_struct_completions (text, prefix, hint);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	254 else
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	255 names = make_name_list ();
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	256
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	257 // Sort and remove duplicates.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	258
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	259 names.sort (true);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	260
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	261 return names;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	262 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	263
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	264 static bool
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	265 is_completing_dirfns (void)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	266 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	267 static std::string dirfns_commands[] = {"cd", "isfile", "isfolder", "ls"};
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	268 static const size_t dirfns_commands_length = 4;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	269
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	270 bool retval = false;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	271
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	272 std::string line = command_editor::get_line_buffer ();
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	273
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	274 for (size_t i = 0; i < dirfns_commands_length; i++)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	275 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	276 int index = line.find (dirfns_commands[i] + ' ');
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	277
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	278 if (index == 0)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	279 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	280 retval = true;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	281 break;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	282 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	283 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	284
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	285 return retval;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	286 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	287
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	288 static std::string
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	289 generate_completion (const std::string& text, int state)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	290 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	291 std::string retval;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	292
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	293 static std::string prefix;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	294 static std::string hint;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	295
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	296 static size_t hint_len = 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	297
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	298 static int list_index = 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	299 static int name_list_len = 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	300 static int name_list_total_len = 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	301 static string_vector name_list;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	302 static string_vector file_name_list;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	303
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	304 static int matches = 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	305
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	306 if (state == 0)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	307 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	308 list_index = 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	309
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	310 prefix = "";
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	311
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	312 hint = text;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	313
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	314 // No reason to display symbols while completing a
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	315 // file/directory operation.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	316
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	317 bool deemed_struct = false;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	318
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	319 if (is_completing_dirfns ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	320 name_list = string_vector ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	321 else
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	322 name_list = generate_possible_completions (text, prefix, hint,
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	323 deemed_struct);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	324
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	325 name_list_len = name_list.numel ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	326
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	327 // If the line was something like "a{1}." then text = "." but
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	328 // we don't want to expand all the . files.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	329 if (! deemed_struct)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	330 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	331
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	332 file_name_list = command_editor::generate_filename_completions (text);
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	333
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	334 name_list.append (file_name_list);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	335
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	336 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	337
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	338 name_list_total_len = name_list.numel ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	339
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	340 hint_len = hint.length ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	341
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	342 matches = 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	343
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	344 for (int i = 0; i < name_list_len; i++)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	345 if (hint == name_list[i].substr (0, hint_len))
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	346 matches++;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	347 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	348
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	349 if (name_list_total_len > 0 && matches > 0)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	350 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	351 while (list_index < name_list_total_len)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	352 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	353 std::string name = name_list[list_index];
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	354
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	355 list_index++;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	356
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	357 if (hint == name.substr (0, hint_len))
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	358 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	359 // Special case: array reference forces prefix="."
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	360 // in generate_struct_completions ()
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	361 if (list_index <= name_list_len && ! prefix.empty ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	362 retval = (prefix == "." ? "" : prefix) + '.' + name;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	363 else
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	364 retval = name;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	365
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	366 char prev_char = command_editor::get_prev_char
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	367 (text.length ());
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	368 if (matches == 1 && looks_like_struct (retval, prev_char))
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	369 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	370 // Don't append anything, since we don't know
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	371 // whether it should be '(' or '.'.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	372
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	373 command_editor::set_completion_append_character ('\0');
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	374 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	375 else
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	376 {
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	377 input_system& input_sys
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	378 = __get_input_system__ ("generate_completion");
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	379
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	380 command_editor::set_completion_append_character
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	381 (input_sys.completion_append_char ());
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	382 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	383
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	384 break;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	385 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	386 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	387 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	388
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	389 return retval;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	390 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	391
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	392 // Use literal "octave" in default setting for PS1 instead of
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	393 // "\\s" to avoid setting the prompt to "octave.exe" or
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	394 // "octave-gui", etc.
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	395
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	396 input_system::input_system (interpreter& interp)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	397 : m_interpreter (interp), m_PS1 (R"(octave:\#> )"), m_PS2 ("> "),
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	398 m_completion_append_char (' '), m_gud_mode (false),
27272 9de4741a896e Do not ignore user preferences for locale encoding on non-Windows platforms. Markus Mützel <markus.muetzel@gmx.de> parents: 27263 diff changeset	399 m_mfile_encoding ("system"), m_last_debugging_command ("\n"),
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	400 m_input_event_hook_functions ()
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	401 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	402 }
22171 0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	403
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	404 void input_system::initialize (bool line_editing)
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	405 {
27200 dc1edf932248 eliminate direct access to call_stack in input functions John W. Eaton <jwe@octave.org> parents: 27162 diff changeset	406 // Force default line editor if we don't want readline editing.
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	407 if (! line_editing)
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	408 {
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	409 command_editor::force_default_editor ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	410 return;
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	411 }
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	412
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	413 // If we are using readline, this allows conditional parsing of the
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	414 // .inputrc file.
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	415
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	416 command_editor::set_name ("Octave");
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	417
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	418 // FIXME: this needs to include a comma too, but that
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	419 // causes trouble for the new struct element completion code.
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	420
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	421 static const char s = "\t\n !\"\'+-/:;<=>(){}[\\]^`~";
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	422
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	423 command_editor::set_basic_word_break_characters (s);
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	424
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	425 command_editor::set_completer_word_break_characters (s);
22171 0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	426
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	427 command_editor::set_basic_quote_characters (R"(")");
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	428
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	429 command_editor::set_filename_quote_characters (" \t\n\\\"'@<>=;\|&()#$`?*[!:{");
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	430
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	431 command_editor::set_completer_quote_characters (R"('")");
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	432
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	433 command_editor::set_completion_function (generate_completion);
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	434
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	435 command_editor::set_quoting_function (quoting_filename);
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	436 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	437
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	438 octave_value
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	439 input_system::PS1 (const octave_value_list& args, int nargout)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	440 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	441 return set_internal_variable (m_PS1, args, nargout, "PS1");
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	442 }
22171 0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	443
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	444 octave_value
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	445 input_system::PS2 (const octave_value_list& args, int nargout)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	446 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	447 return set_internal_variable (m_PS2, args, nargout, "PS2");
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	448 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	449
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	450 octave_value
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	451 input_system::completion_append_char (const octave_value_list& args,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	452 int nargout)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	453 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	454 return set_internal_variable (m_completion_append_char, args, nargout,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	455 "completion_append_char");
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	456 }
22171 0a4c5a90f286 Allow tab completion of arrays of structures. Lachlan Andrew <lachlanbis@gmail.com> parents: 22164 diff changeset	457
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	458 octave_value
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	459 input_system::gud_mode (const octave_value_list& args, int nargout)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	460 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	461 return set_internal_variable (m_gud_mode, args, nargout, "__gud_mode__");
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	462 }
269 0febc87abbd4 [project @ 1994-01-05 08:17:07 by jwe] jwe parents: 252 diff changeset	463
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	464 octave_value
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	465 input_system::mfile_encoding (const octave_value_list& args, int nargout)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	466 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	467 // Save current value in case there is an error in the additional
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	468 // validation below.
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	469
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	470 std::string saved_encoding = m_mfile_encoding;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	471
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	472 // We must pass the actual variable to change here for temporary
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	473 // "local" settings to work properly.
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	474
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	475 octave_value retval
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	476 = set_internal_variable (m_mfile_encoding, args, nargout,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	477 "__mfile_encoding__");
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	478
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	479 // Additional validation if the encoding has changed.
1358 dc9c01f66a19 [project @ 1995-09-05 21:10:01 by jwe] jwe parents: 1352 diff changeset	480
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	481 if (m_mfile_encoding != saved_encoding)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	482 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	483 if (m_mfile_encoding.empty ())
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	484 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	485 m_mfile_encoding = "system";
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	486 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	487 else
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	488 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	489 std::transform (m_mfile_encoding.begin (),
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	490 m_mfile_encoding.end (),
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	491 m_mfile_encoding.begin (), ::tolower);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3877 diff changeset	492
26880 6c25c714bec4 Improve error checking for iconv_open. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	493 std::string encoding = (m_mfile_encoding.compare ("system") == 0)
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	494 ? octave_locale_charset_wrapper () : m_mfile_encoding;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3877 diff changeset	495
26880 6c25c714bec4 Improve error checking for iconv_open. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	496 // Check for valid encoding name.
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	497 void *codec
26880 6c25c714bec4 Improve error checking for iconv_open. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	498 = octave_iconv_open_wrapper (encoding.c_str (), "utf-8");
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	499
26880 6c25c714bec4 Improve error checking for iconv_open. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	500 if (codec == reinterpret_cast<void *> (-1))
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	501 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	502 m_mfile_encoding = saved_encoding;
26880 6c25c714bec4 Improve error checking for iconv_open. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	503 if (errno == EINVAL)
6c25c714bec4 Improve error checking for iconv_open. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	504 error ("__mfile_encoding__: conversion from encoding '%s' "
6c25c714bec4 Improve error checking for iconv_open. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	505 "not supported", encoding.c_str ());
6c25c714bec4 Improve error checking for iconv_open. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	506 else
6c25c714bec4 Improve error checking for iconv_open. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	507 error ("__mfile_encoding__: error %d opening encoding '%s'.",
6c25c714bec4 Improve error checking for iconv_open. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	508 errno, encoding.c_str ());
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	509 }
26880 6c25c714bec4 Improve error checking for iconv_open. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	510 else
6c25c714bec4 Improve error checking for iconv_open. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	511 octave_iconv_close_wrapper (codec);
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	512 }
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25659 diff changeset	513
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	514 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	515
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25659 diff changeset	516 // Synchronize the related gui preference for editor encoding
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	517 feval ("__event_manager_gui_preference__",
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	518 ovl ("editor/default_encoding", m_mfile_encoding));
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25659 diff changeset	519
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	520 return retval;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	521 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	522
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	523 bool input_system::yes_or_no (const std::string& prompt)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	524 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	525 std::string prompt_string = prompt + "(yes or no) ";
6367 268bfc8a2755 [project @ 2007-02-28 20:16:05 by jwe] jwe parents: 6317 diff changeset	526
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	527 while (1)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	528 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	529 bool eof = false;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	530
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	531 std::string input_buf = interactive_input (prompt_string, eof);
6979 2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6945 diff changeset	532
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	533 if (input_buf == "yes")
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	534 return true;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	535 else if (input_buf == "no")
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	536 return false;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	537 else
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	538 message (nullptr, "Please answer yes or no.");
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	539 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	540 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	541
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	542 std::string input_system::interactive_input (const std::string& s, bool& eof)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	543 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	544 Vlast_prompt_time.stamp ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	545
27301 a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	546 if (Vdrawnow_requested && m_interpreter.interactive ())
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	547 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	548 bool eval_error = false;
6979 2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6945 diff changeset	549
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	550 try
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	551 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27301 diff changeset	552 Fdrawnow (m_interpreter);
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	553 }
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	554 catch (const execution_exception& e)
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	555 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	556 eval_error = true;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	557
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	558 std::string stack_trace = e.info ();
269 0febc87abbd4 [project @ 1994-01-05 08:17:07 by jwe] jwe parents: 252 diff changeset	559
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	560 if (! stack_trace.empty ())
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	561 std::cerr << stack_trace;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	562
27301 a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	563 if (m_interpreter.interactive ())
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	564 interpreter::recover_from_exception ();
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	565 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	566
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	567 flush_stdout ();
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	568
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	569 // We set Vdrawnow_requested to false even if there is an error in
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	570 // drawnow so that the error doesn't reappear at every prompt.
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	571
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	572 Vdrawnow_requested = false;
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16416 diff changeset	573
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	574 if (eval_error)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	575 return "\n";
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	576 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	577
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	578 return gnu_readline (s, eof);
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	579 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	580
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	581 // If the user simply hits return, this will produce an empty matrix.
6305 48f8af442b8a [project @ 2007-02-14 22:16:53 by jwe] jwe parents: 6257 diff changeset	582
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	583 octave_value_list
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	584 input_system::get_user_input (const octave_value_list& args, int nargout)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	585 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	586 octave_value_list retval;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	587
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	588 int read_as_string = 0;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	589
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	590 if (args.length () == 2)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	591 read_as_string++;
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	592
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	593 std::string prompt = args(0).xstring_value ("input: unrecognized argument");
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	594
25435 a52e6fb674b1 eliminate some singletons and static & global variables John W. Eaton <jwe@octave.org> parents: 25407 diff changeset	595 output_system& output_sys = __get_output_system__ ("do_sync");
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	596
25435 a52e6fb674b1 eliminate some singletons and static & global variables John W. Eaton <jwe@octave.org> parents: 25407 diff changeset	597 output_sys.reset ();
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	598
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	599 octave_diary << prompt;
25402 ef2b9d4abf4a eliminate some global variables from tree_evaluator John W. Eaton <jwe@octave.org> parents: 25392 diff changeset	600
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	601 bool eof = false;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	602
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	603 std::string input_buf = interactive_input (prompt.c_str (), eof);
19595 be7ac98fab43 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19379 diff changeset	604
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	605 if (input_buf.empty ())
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	606 error ("input: reading user-input failed!");
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	607
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	608 size_t len = input_buf.length ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	609
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	610 octave_diary << input_buf;
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	611
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	612 if (input_buf[len - 1] != '\n')
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	613 octave_diary << "\n";
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	614
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	615 if (read_as_string)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	616 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	617 // FIXME: fix gnu_readline and octave_gets instead!
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	618 if (input_buf.length () == 1 && input_buf[0] == '\n')
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	619 retval(0) = "";
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	620 else
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	621 retval(0) = input_buf;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	622 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	623 else
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	624 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	625 int parse_status = 0;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	626
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 26062 diff changeset	627 retval
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 26062 diff changeset	628 = m_interpreter.eval_string (input_buf, true, parse_status, nargout);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	629
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	630 tree_evaluator& tw = m_interpreter.get_evaluator ();
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	631
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	632 if (! tw.in_debug_repl () && retval.empty ())
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	633 retval(0) = Matrix ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	634 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	635
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	636 return retval;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 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
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	639 bool input_system::have_input_event_hooks (void) const
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	640 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	641 return ! m_input_event_hook_functions.empty ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	642 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	643
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	644 void input_system::add_input_event_hook (const hook_function& hook_fcn)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	645 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	646 m_input_event_hook_functions.insert (hook_fcn.id (), hook_fcn);
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 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
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	649 bool input_system::remove_input_event_hook (const std::string& hook_fcn_id)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	650 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	651 hook_function_list::iterator p
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	652 = m_input_event_hook_functions.find (hook_fcn_id);
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	653
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	654 if (p == m_input_event_hook_functions.end ())
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	655 return false;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	656
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	657 m_input_event_hook_functions.erase (p);
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	658 return true;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	659 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	660
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	661 void input_system::clear_input_event_hooks (void)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	662 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	663 m_input_event_hook_functions.clear ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	664 }
269 0febc87abbd4 [project @ 1994-01-05 08:17:07 by jwe] jwe parents: 252 diff changeset	665
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	666 void input_system::run_input_event_hooks (void)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	667 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	668 m_input_event_hook_functions.run ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	669 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	670
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	671 std::string
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	672 input_system::gnu_readline (const std::string& s, bool& eof) const
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	673 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	674 octave_quit ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	675
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	676 eof = false;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	677
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	678 std::string retval = command_editor::readline (s, eof);
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	679
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	680 if (! eof && retval.empty ())
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	681 retval = "\n";
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	682
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	683 return retval;
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	684 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	685
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	686 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	687 {
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	688 octave_quit ();
5142 0f9108f298ab [project @ 2005-02-12 02:29:34 by jwe] jwe parents: 5092 diff changeset	689
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	690 eof = false;
16097 2f4fa62089b3 improve end of file handling for lexer input John W. Eaton <jwe@octave.org> parents: 16053 diff changeset	691
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	692 std::string retval;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	693
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	694 // 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	695 // printing the prompt.
16349 610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	696
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	697 interpreter& interp = __get_interpreter__ ("base_reader::octave_gets");
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	698
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	699 tree_evaluator& tw = interp.get_evaluator ();
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	700
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	701 event_manager& evmgr = interp.get_event_manager ();
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27200 diff changeset	702
27301 a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	703 if (interp.interactive ())
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	704 {
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	705 if (! tw.in_debug_repl ())
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	706 evmgr.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	707
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	708 evmgr.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	709
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	710 evmgr.set_workspace ();
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	711 }
16349 610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	712
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	713 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	714
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	715 input_system& input_sys = interp.get_input_system ();
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	716
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	717 std::string ps = (m_pflag > 0) ? input_sys.PS1 () : input_sys.PS2 ();
16198 2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	718
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	719 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	720
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	721 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	722
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	723 output_system& output_sys = interp.get_output_system ();
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1750 diff changeset	724
25435 a52e6fb674b1 eliminate some singletons and static & global variables John W. Eaton <jwe@octave.org> parents: 25407 diff changeset	725 output_sys.reset ();
2618 aa667ac18d12 [project @ 1997-01-23 03:16:28 by jwe] jwe parents: 2470 diff changeset	726
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	727 octave_diary << prompt;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	728
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	729 retval = input_sys.interactive_input (prompt, eof);
581 bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe] jwe parents: 529 diff changeset	730
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	731 // 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	732 // user input.
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	733 if (retval != "\n"
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	734 && 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	735 {
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	736 load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	737
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	738 lp.update ();
8841 c74389115610 auto repeat for debugging commands John W. Eaton <jwe@octave.org> parents: 8749 diff changeset	739
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	740 if (tw.in_debug_repl ())
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	741 input_sys.last_debugging_command (retval);
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	742 else
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	743 input_sys.last_debugging_command ("\n");
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	744 }
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	745 else if (tw.in_debug_repl ())
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	746 {
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	747 retval = input_sys.last_debugging_command ();
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	748 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	749 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	750
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	751 if (retval != "\n")
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	752 {
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	753 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	754 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	755 if (command_history::add (retval))
27428 e94868c1369f Increment command number even when command is interrupted. (bug #55819). Anthony Morast <anthony.a.morast@gmail.com> parents: 27408 diff changeset	756 {
e94868c1369f Increment command number even when command is interrupted. (bug #55819). Anthony Morast <anthony.a.morast@gmail.com> parents: 27408 diff changeset	757 evmgr.append_history (retval);
e94868c1369f Increment command number even when command is interrupted. (bug #55819). Anthony Morast <anthony.a.morast@gmail.com> parents: 27408 diff changeset	758 if (! tw.in_debug_repl ())
e94868c1369f Increment command number even when command is interrupted. (bug #55819). Anthony Morast <anthony.a.morast@gmail.com> parents: 27408 diff changeset	759 command_editor::increment_current_command_number ();
e94868c1369f Increment command number even when command is interrupted. (bug #55819). Anthony Morast <anthony.a.morast@gmail.com> parents: 27408 diff changeset	760 }
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	761 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	762
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	763 octave_diary << retval;
3176 fccab8e7d35f [project @ 1998-05-18 20:33:31 by jwe] jwe parents: 3165 diff changeset	764
26061 cb3ead3cf859 avoid assertion failure with -D_GLIBCXX_ASSERTIONS Orion Poplawski <orion@cora.nwra.com> parents: 25054 diff changeset	765 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	766 octave_diary << "\n";
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	767 }
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	768 else
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	769 octave_diary << "\n";
581 bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe] jwe parents: 529 diff changeset	770
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	771 // 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	772 // list has been updated.
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9396 diff changeset	773
27301 a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	774 if (interp.interactive ())
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	775 evmgr.post_input_event ();
16349 610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	776
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	777 return retval;
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	778 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	779
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	780 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	781 {
27162 eab1c573c4fc store reference to lexer in reader instead of pointer John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	782 return m_lexer.m_reading_fcn_file;
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	783 }
17731 f79bf671a493 eliminate global LEXER variable John W. Eaton <jwe@octave.org> parents: 17323 diff changeset	784
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	785 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	786 {
27162 eab1c573c4fc store reference to lexer in reader instead of pointer John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	787 return m_lexer.m_reading_classdef_file;
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	788 }
17731 f79bf671a493 eliminate global LEXER variable John W. Eaton <jwe@octave.org> parents: 17323 diff changeset	789
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	790 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	791 {
27162 eab1c573c4fc store reference to lexer in reader instead of pointer John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	792 return m_lexer.m_reading_script_file;
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	793 }
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	794
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	795 class
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	796 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	797 {
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	798 public:
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	799
27162 eab1c573c4fc store reference to lexer in reader instead of pointer John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	800 terminal_reader (base_lexer& lxr)
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	801 : base_reader (lxr)
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	802 { }
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	803
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	804 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	805
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	806 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	807
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	808 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	809
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	810 private:
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	811
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	812 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	813 };
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	814
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	815 class
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	816 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	817 {
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	818 public:
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	819
27162 eab1c573c4fc store reference to lexer in reader instead of pointer John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	820 file_reader (FILE *f_arg, base_lexer& lxr)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	821 : 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	822
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	823 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	824
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	825 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	826
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	827 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	828
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	829 private:
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	830
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	831 FILE *m_file;
24732 f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	832
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	833 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	834 };
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	835
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	836 class
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	837 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	838 {
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	839 public:
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	840
27162 eab1c573c4fc store reference to lexer in reader instead of pointer John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	841 eval_string_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	842 : 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	843 { }
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	844
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	845 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	846
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	847 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	848
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	849 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	850
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	851 private:
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	852
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	853 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	854
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	855 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	856 };
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	857
27162 eab1c573c4fc store reference to lexer in reader instead of pointer John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	858 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	859 : 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	860 { }
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	861
27162 eab1c573c4fc store reference to lexer in reader instead of pointer John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	862 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	863 : 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	864 { }
f079a0856321 move internal input reader classes out of header file John W. Eaton <jwe@octave.org> parents: 24597 diff changeset	865
27162 eab1c573c4fc store reference to lexer in reader instead of pointer John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	866 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	867 : 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	868 { }
17731 f79bf671a493 eliminate global LEXER variable John W. Eaton <jwe@octave.org> parents: 17323 diff changeset	869
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	870 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	871
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	872 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	873
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	874 std::string
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	875 terminal_reader::get_input (bool& eof)
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	876 {
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	877 octave_quit ();
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	878
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	879 eof = false;
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	880
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	881 return octave_gets (eof);
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	882 }
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	883
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	884 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	885
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	886 std::string
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	887 file_reader::get_input (bool& eof)
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	888 {
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	889 octave_quit ();
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	890
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	891 eof = false;
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	892
25361 82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	893 std::string src_str = octave_fgets (m_file, eof);
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	894
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	895 input_system& input_sys
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	896 = __get_input_system__ ("get_input");
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	897
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	898 std::string mfile_encoding = input_sys.mfile_encoding ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	899
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	900 std::string encoding
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	901 = (mfile_encoding.compare ("system") == 0
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	902 ? octave_locale_charset_wrapper () : mfile_encoding);
25361 82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	903
25620 467729037209 Strip BOM from UTF-8 encoded .m files (bug #52574). Markus Mützel <markus.muetzel@gmx.de> parents: 25441 diff changeset	904 if (encoding.compare ("utf-8") == 0)
467729037209 Strip BOM from UTF-8 encoded .m files (bug #52574). Markus Mützel <markus.muetzel@gmx.de> parents: 25441 diff changeset	905 {
467729037209 Strip BOM from UTF-8 encoded .m files (bug #52574). Markus Mützel <markus.muetzel@gmx.de> parents: 25441 diff changeset	906 // Check for BOM and strip it
467729037209 Strip BOM from UTF-8 encoded .m files (bug #52574). Markus Mützel <markus.muetzel@gmx.de> parents: 25441 diff changeset	907 if (src_str.compare (0, 3, "\xef\xbb\xbf") == 0)
467729037209 Strip BOM from UTF-8 encoded .m files (bug #52574). Markus Mützel <markus.muetzel@gmx.de> parents: 25441 diff changeset	908 src_str.erase (0, 3);
467729037209 Strip BOM from UTF-8 encoded .m files (bug #52574). Markus Mützel <markus.muetzel@gmx.de> parents: 25441 diff changeset	909 }
467729037209 Strip BOM from UTF-8 encoded .m files (bug #52574). Markus Mützel <markus.muetzel@gmx.de> parents: 25441 diff changeset	910 else
25361 82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	911 {
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	912 // convert encoding to UTF-8 before returning string
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	913 const char *src = src_str.c_str ();
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	914 size_t srclen = src_str.length ();
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	915
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	916 size_t length;
26358 d527c6111425 input.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26193 diff changeset	917 uint8_t *utf8_str;
25361 82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	918
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	919 utf8_str = octave_u8_conv_from_encoding (encoding.c_str (), src, srclen,
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	920 &length);
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	921
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	922 if (! utf8_str)
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	923 error ("file_reader::get_input: converting from codepage '%s' to UTF-8: %s",
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	924 encoding.c_str (), std::strerror (errno));
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	925
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	926 unwind_protect frame;
25361 82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	927 frame.add_fcn (::free, static_cast<void *> (utf8_str));
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	928
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	929 src_str = std::string (reinterpret_cast<char *> (utf8_str), length);
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	930 }
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	931
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	932 return src_str;
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	933 }
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	934
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	935 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	936
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	937 std::string
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	938 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	939 {
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	940 octave_quit ();
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	941
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	942 eof = false;
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	943
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	944 std::string retval;
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	945
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24732 diff changeset	946 retval = m_eval_string;
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	947
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	948 // 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	949 // 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	950 m_eval_string = "";
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	951
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	952 if (retval.empty ())
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	953 eof = true;
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	954
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	955 return retval;
aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	956 }
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	957 }
b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	958
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	959 DEFMETHOD (input, interp, args, nargout,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	960 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	961 @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	962 @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	963 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	964
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	965 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	966
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	967 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	968 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	969 @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	970
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	971 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	972 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	973
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	974 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	975 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	976 @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	977
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	978 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	979 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	980 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	981 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	982
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	983 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	984 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	985
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	986 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	987 @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	988 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	989 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	990
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	991 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	992 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	993 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	994 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	995 @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	996 @end deftypefn */)
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	997 {
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	998 int nargin = args.length ();
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	999
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1000 if (nargin < 1 \|\| nargin > 2)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	1001 print_usage ();
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	1002
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1003 octave::input_system& input_sys = interp.get_input_system ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1004
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1005 return input_sys.get_user_input (args, std::max (nargout, 1));
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	1006 }
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	1007
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1008 DEFMETHOD (yes_or_no, interp, args, ,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1009 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	1010 @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	1011 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	1012
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1013 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	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 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	1016 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	1017 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	1018 @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	1019 @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	1020 @end deftypefn */)
5640 426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	1021 {
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	1022 int nargin = args.length ();
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	1023
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1024 if (nargin > 1)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	1025 print_usage ();
5640 426719471ac6 [project @ 2006-03-04 06:02:14 by jwe] jwe parents: 5388 diff changeset	1026
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1027 octave::input_system& input_sys = interp.get_input_system ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1028
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1029 std::string prompt;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1030
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1031 if (nargin == 1)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1032 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	1033
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1034 return ovl (input_sys.yes_or_no (prompt));
23728 b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1035 }
b40b7243a782 new class for caching file contents for debug and echo John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1036
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1037 DEFMETHOD (keyboard, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1038 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	1039 @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	1040 @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	1041 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	1042
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1043 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	1044 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	1045 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	1046 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	1047 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	1048 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	1049
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1050 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	1051 @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	1052 @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	1053 @end deftypefn */)
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	1054 {
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	1055 int nargin = args.length ();
9483 25c2e92ee03c correctly skip frame assigned to keyboard function John W. Eaton <jwe@octave.org> parents: 9482 diff changeset	1056
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	1057 if (nargin > 1)
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	1058 print_usage ();
10186 095a1e670e68 make dbstep work with keyboard function John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1059
25402 ef2b9d4abf4a eliminate some global variables from tree_evaluator John W. Eaton <jwe@octave.org> parents: 25392 diff changeset	1060 octave::tree_evaluator& tw = interp.get_evaluator ();
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1061
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	1062 if (nargin == 1)
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	1063 {
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	1064 std::string prompt
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	1065 = args(0).xstring_value ("keyboard: PROMPT must be a string");
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1066
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	1067 tw.keyboard (prompt);
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	1068 }
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	1069 else
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26884 diff changeset	1070 tw.keyboard ();
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	1071
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20940 diff changeset	1072 return ovl ();
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	1073 }
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 339 diff changeset	1074
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1075 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	1076 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	1077 @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	1078 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	1079
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1080 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	1081 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	1082 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	1083 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	1084 @end deftypefn */)
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1085 {
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20817 diff changeset	1086 if (args.length () != 1)
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1087 print_usage ();
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1088
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1089 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1090
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1091 std::string hint = args(0).string_value ();
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1092
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1093 int n = 32;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1094
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1095 string_vector list (n);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20239 diff changeset	1096
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1097 int k = 0;
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1098
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1099 for (;;)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1100 {
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1101 std::string cmd = octave::generate_completion (hint, k);
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1102
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1103 if (! cmd.empty ())
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20239 diff changeset	1104 {
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1105 if (k == n)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	1106 {
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1107 n *= 2;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1108 list.resize (n);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	1109 }
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1110
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1111 list[k++] = cmd;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20239 diff changeset	1112 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20239 diff changeset	1113 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20239 diff changeset	1114 {
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1115 list.resize (k);
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1116 break;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1117 }
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1118 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20239 diff changeset	1119
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1120 if (nargout > 0)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1121 {
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1122 if (! list.empty ())
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1123 retval = list;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1124 else
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1125 retval = "";
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1126 }
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1127 else
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1128 {
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1129 // 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	1130 // 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	1131 // appear in a single column.
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1132
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1133 int len = list.numel ();
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1134
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1135 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	1136 octave_stdout << list[i] << "\n";
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1137 }
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1138
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1139 octave_completion_matches_called = true;
2234 a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1140
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1141 return retval;
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1142 }
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe] jwe parents: 2205 diff changeset	1143
20239 48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1144 /*
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1145 %!assert (ischar (completion_matches ("")))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1146 %!assert (ischar (completion_matches ("a")))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1147 %!assert (ischar (completion_matches (" ")))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1148 %!assert (isempty (completion_matches (" ")))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1149 %!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	1150 %!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	1151 %!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	1152 %!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	1153 %!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	1154
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1155 %!error completion_matches ()
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1156 %!error completion_matches (1, 2)
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1157 */
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins Mike Miller <mtmiller@octave.org> parents: 20232 diff changeset	1158
16879 cc3743a91652 Rename read_readline_init_file to readline_read_init_file. Rik <rik@octave.org> parents: 16816 diff changeset	1159 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	1160 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	1161 @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	1162 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	1163
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1164 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	1165 (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	1166
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1167 @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	1168 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	1169 @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	1170 @end deftypefn */)
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1171 {
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1172 int nargin = args.length ();
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 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 (nargin > 1)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1175 print_usage ();
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1176
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1177 if (nargin == 0)
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	1178 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	1179 else
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1180 {
5872 44f24cf66b95 [project @ 2006-06-30 18:19:20 by jwe] jwe parents: 5832 diff changeset	1181 std::string file = args(0).string_value ();
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1182
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	1183 octave::command_editor::read_init_file (file);
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1184 }
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1185
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20940 diff changeset	1186 return ovl ();
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1187 }
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	1188
16880 1aebb613a5ac Rename re_read_readline_init_file to readline_re_read_init_file. Rik <rik@octave.org> parents: 16879 diff changeset	1189 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	1190 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	1191 @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	1192 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	1193
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1194 @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	1195 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	1196 @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	1197 @end deftypefn */)
7758 8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1198 {
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1199 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	1200 print_usage ();
8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1201
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	1202 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	1203
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20940 diff changeset	1204 return ovl ();
7758 8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1205 }
8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1206
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1207 namespace octave
16349 610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	1208 {
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1209 static int internal_input_event_hook_fcn (void)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1210 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1211 input_system& input_sys
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1212 = __get_input_system__ ("internal_input_event_hook_fcn");
16349 610617eb84d1 provide pre- and post-input hook functions John W. Eaton <jwe@octave.org> parents: 16347 diff changeset	1213
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1214 input_sys.run_input_event_hooks ();
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1215
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1216 if (! input_sys.have_input_event_hooks ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1217 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	1218
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1219 return 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1220 }
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1221 }
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1222
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1223 DEFMETHOD (add_input_event_hook, interp, args, ,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1224 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	1225 @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	1226 @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	1227 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	1228 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	1229
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1230 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	1231
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1232 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1233 @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	1234 @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	1235
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1236 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	1237
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1238 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	1239 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	1240 @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	1241 @end deftypefn */)
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1242 {
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1243 int nargin = args.length ();
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 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)
9215 1500d0197484 allow multiple input event hook functions to be installed simultaneously John W. Eaton <jwe@octave.org> parents: 9134 diff changeset	1246 print_usage ();
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1247
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1248 octave_value user_data;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1249
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1250 if (nargin == 2)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1251 user_data = args(1);
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1252
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1253 octave::input_system& input_sys = interp.get_input_system ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1254
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1255 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	1256
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1257 if (! input_sys.have_input_event_hooks ())
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1258 octave::command_editor::add_event_hook (octave::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	1259
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1260 input_sys.add_input_event_hook (hook_fcn);
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1261
21127 df7891224709 maint: Use "return ovl (...)" in DEFUN macros. Rik <rik@octave.org> parents: 21100 diff changeset	1262 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	1263 }
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1264
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1265 DEFMETHOD (remove_input_event_hook, interp, args, ,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1266 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	1267 @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	1268 @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	1269 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	1270 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	1271 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	1272 @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	1273 @end deftypefn */)
9215 1500d0197484 allow multiple input event hook functions to be installed simultaneously John W. Eaton <jwe@octave.org> parents: 9134 diff changeset	1274 {
1500d0197484 allow multiple input event hook functions to be installed simultaneously John W. Eaton <jwe@octave.org> parents: 9134 diff changeset	1275 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	1276
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1277 if (nargin < 1 \|\| nargin > 2)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1278 print_usage ();
16347 bf8397caeff1 allow add_input_event_hook to accept function handles John W. Eaton <jwe@octave.org> parents: 16336 diff changeset	1279
26358 d527c6111425 input.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26193 diff changeset	1280 std::string hook_fcn_id = args(0).xstring_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	1281
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1282 bool warn = (nargin < 2);
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1283
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1284 octave::input_system& input_sys = interp.get_input_system ();
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1285
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1286 if (! input_sys.remove_input_event_hook (hook_fcn_id) && warn)
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1287 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	1288 hook_fcn_id.c_str ());
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1289
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1290 if (! input_sys.have_input_event_hooks ())
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1291 octave::command_editor::remove_event_hook (octave::internal_input_event_hook_fcn);
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1292
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20940 diff changeset	1293 return ovl ();
3498 e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1294 }
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe] jwe parents: 3484 diff changeset	1295
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1296 DEFMETHOD (PS1, interp, args, nargout,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1297 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	1298 @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	1299 @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	1300 @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	1301 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	1302
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1303 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	1304 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	1305
24595 5ed2e9248ee9 doc: Tweaks to use single quotes instead of double quotes (bug #52870). Rik <rik@octave.org> parents: 23219 diff changeset	1306 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	1307 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	1308
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1309 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1310 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	1311 @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	1312
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1313 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1314 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	1315 @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	1316 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	1317 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	1318
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1319 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	1320 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	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 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1323 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	1324 @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	1325
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1326 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1327 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	1328
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1329 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	1330 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	1331 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	1332 @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	1333 @end deftypefn */)
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1334 {
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1335 octave::input_system& input_sys = interp.get_input_system ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1336
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1337 return input_sys.PS1 (args, nargout);
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1338 }
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2114 diff changeset	1339
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1340 DEFMETHOD (PS2, interp, args, nargout,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1341 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	1342 @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	1343 @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	1344 @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	1345 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	1346
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1347 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	1348 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	1349 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	1350 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	1351 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	1352
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1353 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	1354 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	1355 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	1356 @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	1357 @end deftypefn */)
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1358 {
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1359 octave::input_system& input_sys = interp.get_input_system ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1360
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1361 return input_sys.PS2 (args, nargout);
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1362 }
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2114 diff changeset	1363
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1364 DEFMETHOD (completion_append_char, interp, args, nargout,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1365 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	1366 @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	1367 @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	1368 @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	1369 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	1370 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	1371
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1372 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	1373
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21920 diff changeset	1374 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	1375 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	1376 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	1377 @end deftypefn */)
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1378 {
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1379 octave::input_system& input_sys = interp.get_input_system ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1380
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1381 return input_sys.completion_append_char (args, nargout);
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	1382 }
3019 92aa3d651723 [project @ 1997-06-03 22:07:16 by jwe] jwe parents: 3016 diff changeset	1383
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1384 DEFMETHOD (__request_drawnow__, , args, ,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1385 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	1386 @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	1387 @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	1388 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	1389 @end deftypefn */)
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1390 {
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1391 int nargin = args.length ();
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1392
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1393 if (nargin > 1)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1394 print_usage ();
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1395
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1396 if (nargin == 0)
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1397 Vdrawnow_requested = true;
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1398 else
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1399 Vdrawnow_requested = args(0).bool_value ();
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1400
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20940 diff changeset	1401 return ovl ();
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1402 }
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6206 diff changeset	1403
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1404 DEFMETHOD (__gud_mode__, interp, args, nargout,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1405 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	1406 @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	1407 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	1408 @end deftypefn */)
7294 fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1409 {
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1410 octave::input_system& input_sys = interp.get_input_system ();
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1411
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1412 return input_sys.gud_mode (args, nargout);
7294 fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1413 }
25361 82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	1414
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1415 DEFMETHOD (__mfile_encoding__, interp, args, nargout,
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1416 doc: /* -- texinfo --
25361 82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	1417 @deftypefn {} {@var{current_encoding} =} __mfile_encoding__ (@var{new_encoding})
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	1418 Set and query the codepage that is used for reading .m files.
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	1419 @end deftypefn */)
82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	1420 {
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1421 octave::input_system& input_sys = interp.get_input_system ();
7294 fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1422
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1423 return input_sys.mfile_encoding (args, nargout);
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1424 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1425
25659 e6d3f4f9473c always provide definitions for deprecated functions John W. Eaton <jwe@octave.org> parents: 25620 diff changeset	1426 // Always define these functions. The macro is intended to allow the
e6d3f4f9473c always provide definitions for deprecated functions John W. Eaton <jwe@octave.org> parents: 25620 diff changeset	1427 // declarations to be hidden, not so that Octave will not provide the
e6d3f4f9473c always provide definitions for deprecated functions John W. Eaton <jwe@octave.org> parents: 25620 diff changeset	1428 // functions if they are requested.
25361 82445187633e Add support for arbitrary character encodings in m-files (bug #53842). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	1429
25659 e6d3f4f9473c always provide definitions for deprecated functions John W. Eaton <jwe@octave.org> parents: 25620 diff changeset	1430 // #if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS)
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1431
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1432 bool
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1433 octave_yes_or_no (const std::string& prompt)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1434 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1435 octave::input_system& input_sys
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1436 = octave::__get_input_system__ ("set_default_prompts");
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1437
25659 e6d3f4f9473c always provide definitions for deprecated functions John W. Eaton <jwe@octave.org> parents: 25620 diff changeset	1438 return input_sys.yes_or_no (prompt);
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1439 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1440
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1441 void
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1442 remove_input_event_hook_functions (void)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1443 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1444 octave::input_system& input_sys
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1445 = octave::__get_input_system__ ("remove_input_event_hook_functions");
7294 fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1446
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1447 input_sys.clear_input_event_hooks ();
7294 fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe] jwe parents: 7097 diff changeset	1448 }
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1449
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1450 // Fix things up so that input can come from the standard input. This
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1451 // may need to become much more complicated, which is why it's in a
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1452 // separate function.
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1453
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1454 FILE *
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1455 get_input_from_stdin (void)
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1456 {
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1457 octave::command_editor::set_input_stream (stdin);
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1458 return octave::command_editor::get_input_stream ();
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1459 }
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25402 diff changeset	1460
25659 e6d3f4f9473c always provide definitions for deprecated functions John W. Eaton <jwe@octave.org> parents: 25620 diff changeset	1461 // #endif

Mercurial > octave

annotate libinterp/corefcn/input.cc @ 27428:e94868c1369f