annotate libinterp/corefcn/input.cc @ 30564:796f54d4ddbf stable

update Octave Project Developers copyright for the new year In files that have the "Octave Project Developers" copyright notice, update for 2021. In all .txi and .texi files except gpl.txi and gpl.texi in the doc/liboctave and doc/interpreter directories, change the copyright to "Octave Project Developers", the same as used for other source files. Update copyright notices for 2022 (not done since 2019). For gpl.txi and gpl.texi, change the copyright notice to be "Free Software Foundation, Inc." and leave the date at 2007 only because this file only contains the text of the GPL, not anything created by the Octave Project Developers. Add Paul Thomas to contributors.in.
author John W. Eaton <jwe@octave.org>
date Tue, 28 Dec 2021 18:22:40 -0500
parents 26f2daafa270
children 83f9f8bda883
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
2 //
30564
796f54d4ddbf update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 30377
diff changeset
3 // Copyright (C) 1993-2022 The Octave Project Developers
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
14 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 ////////////////////////////////////////////////////////////////////////
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
25
2939
f2feebf0eb7d [project @ 1997-05-06 16:36:34 by jwe]
jwe
parents: 2927
diff changeset
26 // Get command input interactively or from files.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
27
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21547
diff changeset
28 #if defined (HAVE_CONFIG_H)
21301
40de9f8f23a6 Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents: 21200
diff changeset
29 # include "config.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
30 #endif
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
31
10463
bbe99b2a5ba7 undo recent gnulib-related changes
John W. Eaton <jwe@octave.org>
parents: 10447
diff changeset
32 #include <cstdio>
1343
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe]
jwe
parents: 1315
diff changeset
33 #include <cstdlib>
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe]
jwe
parents: 1315
diff changeset
34 #include <cstring>
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe]
jwe
parents: 1315
diff changeset
35 #include <cassert>
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe]
jwe
parents: 1315
diff changeset
36
27748
5fc630696dc7 Compare locale charset name in lower case (bug #57304).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27529
diff changeset
37 #include <algorithm>
3503
d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe]
jwe
parents: 3498
diff changeset
38 #include <iostream>
29335
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
39 #include <queue>
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5744
diff changeset
40 #include <sstream>
1728
42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe]
jwe
parents: 1705
diff changeset
41 #include <string>
42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe]
jwe
parents: 1705
diff changeset
42
2927
8722c6284b72 [project @ 1997-05-05 03:44:04 by jwe]
jwe
parents: 2921
diff changeset
43 #include "cmd-edit.h"
3189
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
44 #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
45 #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
46 #include "localcharset-wrapper.h"
27785
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
47 #include "oct-string.h"
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4143
diff changeset
48 #include "quit.h"
1755
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1750
diff changeset
49 #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
50 #include "uniconv-wrappers.h"
1755
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1750
diff changeset
51
23129
35e3d199527c Replace feval calls with direct call to C++ function (bug #50116).
Rik <rik@octave.org>
parents: 23127
diff changeset
52 #include "builtin-defun-decls.h"
1352
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe]
jwe
parents: 1350
diff changeset
53 #include "defun.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
54 #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
55 #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
56 #include "event-manager.h"
3016
f512c16826d1 [project @ 1997-06-03 03:16:13 by jwe]
jwe
parents: 3014
diff changeset
57 #include "help.h"
16381
f33dcbd6a005 move hook_function classes to separate file
John W. Eaton <jwe@octave.org>
parents: 16378
diff changeset
58 #include "hook-fcn.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
59 #include "input.h"
23438
d24d01273bd0 eliminate load-path singleton
John W. Eaton <jwe@octave.org>
parents: 23433
diff changeset
60 #include "interpreter-private.h"
22094
9203833cab7d move new interpreter class to separate file
John W. Eaton <jwe@octave.org>
parents: 22091
diff changeset
61 #include "interpreter.h"
5832
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe]
jwe
parents: 5823
diff changeset
62 #include "load-path.h"
22089
c2c668b3051b use classes for octave application and interpreter
John W. Eaton <jwe@octave.org>
parents: 22051
diff changeset
63 #include "octave.h"
1352
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe]
jwe
parents: 1350
diff changeset
64 #include "oct-map.h"
1742
a02f140ed897 [project @ 1996-01-12 11:09:39 by jwe]
jwe
parents: 1728
diff changeset
65 #include "oct-hist.h"
22094
9203833cab7d move new interpreter class to separate file
John W. Eaton <jwe@octave.org>
parents: 22091
diff changeset
66 #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
67 #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
68 #include "ovl.h"
16347
bf8397caeff1 allow add_input_event_hook to accept function handles
John W. Eaton <jwe@octave.org>
parents: 16336
diff changeset
69 #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
70 #include "ov-usr-fcn.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
71 #include "pager.h"
529
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 339
diff changeset
72 #include "parse.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents: 8503
diff changeset
73 #include "pt-eval.h"
3805
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe]
jwe
parents: 3804
diff changeset
74 #include "pt-stmt.h"
1352
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe]
jwe
parents: 1350
diff changeset
75 #include "sighandlers.h"
1114
971f2289d6de [project @ 1995-02-15 04:58:06 by jwe]
jwe
parents: 1112
diff changeset
76 #include "sysdep.h"
22094
9203833cab7d move new interpreter class to separate file
John W. Eaton <jwe@octave.org>
parents: 22091
diff changeset
77 #include "interpreter.h"
3098
f4acdc9a77cc [project @ 1997-11-14 09:30:20 by jwe]
jwe
parents: 3081
diff changeset
78 #include "unwind-prot.h"
1352
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe]
jwe
parents: 1350
diff changeset
79 #include "utils.h"
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe]
jwe
parents: 1350
diff changeset
80 #include "variables.h"
529
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 339
diff changeset
81
3165
e4bbfc196e53 [project @ 1998-04-16 03:01:47 by jwe]
jwe
parents: 3100
diff changeset
82 // 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
83 octave::sys::time Vlast_prompt_time = 0.0;
3165
e4bbfc196e53 [project @ 1998-04-16 03:01:47 by jwe]
jwe
parents: 3100
diff changeset
84
3804
4073be5aefa1 [project @ 2001-02-28 08:36:04 by jwe]
jwe
parents: 3772
diff changeset
85 // TRUE after a call to completion_matches.
2299
f296bbc757a1 [project @ 1996-06-23 03:45:44 by jwe]
jwe
parents: 2287
diff changeset
86 bool octave_completion_matches_called = false;
f296bbc757a1 [project @ 1996-06-23 03:45:44 by jwe]
jwe
parents: 2287
diff changeset
87
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
88 // 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
89 // the next user prompt.
7409
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7336
diff changeset
90 bool Vdrawnow_requested = false;
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
91
22164
5d4a286061c8 Track line numbers when in debug mode (bug #45764)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 22094
diff changeset
92 // 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
93 // 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
94 // the terminal.
5d4a286061c8 Track line numbers when in debug mode (bug #45764)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 22094
diff changeset
95 bool Vtrack_line_num = true;
5d4a286061c8 Track line numbers when in debug mode (bug #45764)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 22094
diff changeset
96
29960
939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
97 OCTAVE_NAMESPACE_BEGIN
939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
98
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
99 static std::string
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
100 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
101 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
102 if (quote)
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
103 return text;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
104 else
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
105 return ("'" + text);
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
106 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
107
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
108 // 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
109 // 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
110 // return that expression,
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
111 // 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
112 static std::string
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
113 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
114 {
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
115 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
116
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
117 int pos = line.length () - text.length ();
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
118 int curly_count = 0;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
119 int paren_count = 0;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
120
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
121 int last = --pos;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
122
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
123 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
124 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
125 if (line[pos] == ')')
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
126 paren_count++;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
127 else
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
128 curly_count++;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
129
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
130 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
131 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
132 if (line[pos] == ')')
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
133 paren_count++;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
134 else if (line[pos] == '(')
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
135 paren_count--;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
136 else if (line[pos] == '}')
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
137 curly_count++;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
138 else if (line[pos] == '{')
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
139 curly_count--;
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
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
142 while (--pos >= 0 && line[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 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
145
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
146 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
147 pos--;
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 if (++pos >= 0)
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
150 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
151 else
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
152 return std::string ();
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
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
155 static string_vector
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
156 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
157 std::string& prefix, std::string& hint)
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 string_vector names;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
160
29654
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
161 std::size_t pos = text.rfind ('.');
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
162 bool array = false;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
163
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
164 if (pos != std::string::npos)
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 if (pos == text.length ())
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
167 hint = "";
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
168 else
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
169 hint = text.substr (pos+1);
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
170
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
171 prefix = text.substr (0, pos);
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 if (prefix == "")
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
174 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
175 array = true;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
176 prefix = find_indexed_expression (text);
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
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
179 std::string base_name = prefix;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
180
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
181 pos = base_name.find_first_of ("{(. ");
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
182
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
183 if (pos != std::string::npos)
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
184 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
185
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
186 interpreter& interp
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
187 = __get_interpreter__ ("generate_struct_completions");
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
188
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
189 if (interp.is_variable (base_name))
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
190 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
191 int parse_status;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
192
27160
6b0c61a5a0f0 move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents: 27102
diff changeset
193 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
194
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
195 unwind_protect frame;
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
196
29253
28913793f678 prefer unwind_action over unwind_protect in more places
John W. Eaton <jwe@octave.org>
parents: 29163
diff changeset
197 frame.add (&error_system::set_discard_warning_messages, &es,
28913793f678 prefer unwind_action over unwind_protect in more places
John W. Eaton <jwe@octave.org>
parents: 29163
diff changeset
198 es.discard_warning_messages ());
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
199
27160
6b0c61a5a0f0 move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents: 27102
diff changeset
200 es.discard_warning_messages (true);
27101
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 try
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
203 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
204 octave_value tmp
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
205 = 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
206
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
207 frame.run ();
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
208
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
209 if (tmp.is_defined ()
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
210 && (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
211 names = tmp.map_keys ();
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 catch (const execution_exception&)
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
214 {
27474
3fec8e9fa2aa make recover_from_exception a member function
John W. Eaton <jwe@octave.org>
parents: 27471
diff changeset
215 interp.recover_from_exception ();
27101
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 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
219
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
220 // 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
221 // 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
222 if (array)
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
223 prefix = ".";
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 return names;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
226 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
227
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
228 // 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
229 static bool
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
230 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
231 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
232 bool retval = (! text.empty ()
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
233 && (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
234 && 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
235 && text.find ("..") == std::string::npos
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
236 && text.rfind ('.') != std::string::npos);
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 return retval;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
239 }
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 // 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
242
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
243 static string_vector
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
244 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
245 std::string& hint, bool& deemed_struct)
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 string_vector names;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
248
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
249 prefix = "";
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
250
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
251 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
252 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
253
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
254 if (deemed_struct)
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
255 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
256 else
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
257 names = make_name_list ();
27101
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 // Sort and remove duplicates.
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 names.sort (true);
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 return names;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
264 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
265
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
266 static bool
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
267 is_completing_dirfns (void)
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
268 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
269 static std::string dirfns_commands[] = {"cd", "isfile", "isfolder", "ls"};
29654
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
270 static const std::size_t dirfns_commands_length = 4;
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
271
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
272 bool retval = false;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
273
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
274 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
275
29654
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
276 for (std::size_t i = 0; i < dirfns_commands_length; i++)
27101
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 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
279
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
280 if (index == 0)
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
281 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
282 retval = true;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
283 break;
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 }
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 return retval;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
288 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
289
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
290 static std::string
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
291 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
292 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
293 std::string retval;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
294
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
295 static std::string prefix;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
296 static std::string hint;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
297
29654
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
298 static std::size_t hint_len = 0;
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
299
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
300 static int list_index = 0;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
301 static int name_list_len = 0;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
302 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
303 static string_vector name_list;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
304 static string_vector file_name_list;
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 static int matches = 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 if (state == 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 list_index = 0;
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 prefix = "";
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 hint = text;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
315
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
316 // 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
317 // file/directory operation.
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 bool deemed_struct = false;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
320
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
321 if (is_completing_dirfns ())
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
322 name_list = string_vector ();
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
323 else
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
324 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
325 deemed_struct);
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 name_list_len = name_list.numel ();
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
328
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
329 // 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
330 // 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
331 if (! deemed_struct)
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
332 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
333
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
334 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
335
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
336 name_list.append (file_name_list);
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 }
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 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
341
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
342 hint_len = hint.length ();
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 matches = 0;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
345
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
346 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
347 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
348 matches++;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
349 }
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 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
352 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
353 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
354 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
355 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
356
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
357 list_index++;
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 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
360 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
361 // Special case: array reference forces prefix="."
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
362 // in generate_struct_completions ()
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
363 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
364 retval = (prefix == "." ? "" : prefix) + '.' + name;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
365 else
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
366 retval = name;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
367
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
368 char prev_char =
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
369 command_editor::get_prev_char (text.length ());
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
370
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
371 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
372 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
373 // 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
374 // whether it should be '(' or '.'.
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
375
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
376 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
377 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
378 else
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 input_system& input_sys
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
381 = __get_input_system__ ("generate_completion");
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
382
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
383 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
384 (input_sys.completion_append_char ());
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 break;
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 }
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
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
392 return retval;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
393 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
394
28707
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
395 static int internal_input_event_hook_fcn (void)
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
396 {
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
397 octave_quit ();
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
398
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
399 input_system& input_sys
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
400 = __get_input_system__ ("internal_input_event_hook_fcn");
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
401
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
402 input_sys.run_input_event_hooks ();
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
403
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
404 return 0;
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
405 }
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
406
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
407 // 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
408 // "\\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
409 // "octave-gui", etc.
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
410
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
411 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
412 : 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
413 m_completion_append_char (' '), m_gud_mode (false),
29120
eb6599cf2db5 Use UTF-8 encoding for .m files by default (bug #59387).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29117
diff changeset
414 m_mfile_encoding ("utf-8"), m_auto_repeat_debug_command (true),
28972
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
415 m_last_debugging_command ("\n"), m_input_event_hook_functions (),
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
416 m_initialized (false)
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
417 { }
22171
0a4c5a90f286 Allow tab completion of arrays of structures.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 22164
diff changeset
418
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
419 void input_system::initialize (bool line_editing)
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
420 {
28707
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
421 if (m_initialized)
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
422 return;
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
423
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
424 // Force default line editor if we don't want readline editing.
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
425 if (! line_editing)
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
426 {
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
427 command_editor::force_default_editor ();
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
428 return;
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
429 }
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
430
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
431 // If we are using readline, this allows conditional parsing of the
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
432 // .inputrc file.
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
433
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
434 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
435
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
436 // FIXME: this needs to include a comma too, but that
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
437 // causes trouble for the new struct element completion code.
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
438
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
439 static const char *s = "\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
440
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
441 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
442
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
443 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
444
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
445 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
446
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
447 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
448
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
449 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
450
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
451 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
452
27932
b018f553fd85 maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents: 27923
diff changeset
453 command_editor::set_quoting_function (quoting_filename);
28707
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
454
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
455 command_editor::add_event_hook (internal_input_event_hook_fcn);
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
456
f0a3f4527ba6 respond to signals when readline is waiting for input (bug #54444)
John W. Eaton <jwe@octave.org>
parents: 27932
diff changeset
457 m_initialized = true;
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
458 }
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
459
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
460 octave_value
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
461 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
462 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
463 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
464 }
22171
0a4c5a90f286 Allow tab completion of arrays of structures.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 22164
diff changeset
465
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
466 octave_value
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
467 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
468 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
469 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
470 }
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 octave_value
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
473 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
474 int nargout)
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
475 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
476 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
477 "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
478 }
22171
0a4c5a90f286 Allow tab completion of arrays of structures.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 22164
diff changeset
479
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
480 octave_value
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
481 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
482 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
483 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
484 }
269
0febc87abbd4 [project @ 1994-01-05 08:17:07 by jwe]
jwe
parents: 252
diff changeset
485
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
486 octave_value
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
487 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
488 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
489 // 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
490 // validation below.
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
491
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
492 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
493
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
494 // 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
495 // "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
496
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
497 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
498 = 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
499 "__mfile_encoding__");
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
500
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
501 // Additional validation if the encoding has changed.
1358
dc9c01f66a19 [project @ 1995-09-05 21:10:01 by jwe]
jwe
parents: 1352
diff changeset
502
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
503 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
504 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
505 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
506 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
507 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
508 }
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
509 else
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
510 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
511 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
512 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
513 m_mfile_encoding.begin (), ::tolower);
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3877
diff changeset
514
26880
6c25c714bec4 Improve error checking for iconv_open.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26376
diff changeset
515 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
516 ? octave_locale_charset_wrapper () : m_mfile_encoding;
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3877
diff changeset
517
26880
6c25c714bec4 Improve error checking for iconv_open.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26376
diff changeset
518 // 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
519 void *codec
26880
6c25c714bec4 Improve error checking for iconv_open.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26376
diff changeset
520 = 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
521
26880
6c25c714bec4 Improve error checking for iconv_open.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26376
diff changeset
522 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
523 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
524 m_mfile_encoding = saved_encoding;
26880
6c25c714bec4 Improve error checking for iconv_open.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26376
diff changeset
525 if (errno == EINVAL)
6c25c714bec4 Improve error checking for iconv_open.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26376
diff changeset
526 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
527 "not supported", encoding.c_str ());
6c25c714bec4 Improve error checking for iconv_open.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26376
diff changeset
528 else
28905
89a425f2c202 maint: Use Octave convention that error() messages don't end with a period.
Rik <rik@octave.org>
parents: 28888
diff changeset
529 error ("__mfile_encoding__: error %d opening encoding '%s'",
26880
6c25c714bec4 Improve error checking for iconv_open.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26376
diff changeset
530 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
531 }
26880
6c25c714bec4 Improve error checking for iconv_open.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26376
diff changeset
532 else
6c25c714bec4 Improve error checking for iconv_open.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26376
diff changeset
533 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
534 }
25700
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25659
diff changeset
535
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
536 }
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
537
25700
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25659
diff changeset
538 // 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
539 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
540 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
541
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
542 return retval;
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
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
545 // Get part of the directory that would be added to the load path
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
546 static std::string load_path_dir (const std::string& dir)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
547 {
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
548 std::string lp_dir = dir;
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
549
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
550 // strip trailing filesep
29572
aef11bb4e6d1 use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
John W. Eaton <jwe@octave.org>
parents: 29563
diff changeset
551 std::size_t ipos = lp_dir.find_last_not_of (sys::file_ops::dir_sep_chars ());
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
552 if (ipos != std::string::npos)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
553 lp_dir = lp_dir.erase (ipos+1);
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
554
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
555 // strip trailing private folder
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
556 ipos = lp_dir.find_last_of (sys::file_ops::dir_sep_chars ());
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
557 if (ipos != std::string::npos
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
558 && lp_dir.substr (ipos+1).compare ("private") == 0)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
559 {
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
560 lp_dir = lp_dir.erase (ipos);
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
561 ipos = lp_dir.find_last_of (sys::file_ops::dir_sep_chars ());
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
562 }
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
563
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
564 // strip trailing @class folder
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
565 if (ipos != std::string::npos && lp_dir[ipos+1] == '@')
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
566 {
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
567 lp_dir = lp_dir.erase (ipos);
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
568 ipos = lp_dir.find_last_of (sys::file_ops::dir_sep_chars ());
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
569 }
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
570
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
571 // strip (nested) +namespace folders
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
572 while (ipos != std::string::npos && lp_dir[ipos+1] == '+')
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
573 {
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
574 lp_dir = lp_dir.erase (ipos);
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
575 ipos = lp_dir.find_last_of (sys::file_ops::dir_sep_chars ());
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
576 }
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
577
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
578 return lp_dir;
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
579 }
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
580
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
581 std::string input_system::dir_encoding (const std::string& dir)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
582 {
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
583 std::string enc = m_mfile_encoding;
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
584
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
585 auto enc_it = m_dir_encoding.find (load_path_dir (dir));
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
586 if (enc_it != m_dir_encoding.end ())
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
587 enc = enc_it->second;
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
588
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
589 return enc;
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
590 }
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
591
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
592 void input_system::set_dir_encoding (const std::string& dir,
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
593 std::string& enc)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
594 {
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
595 // use lower case
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
596 std::transform (enc.begin (), enc.end (), enc.begin (), ::tolower);
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
597
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
598 if (enc.compare ("delete") == 0)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
599 {
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
600 // Remove path from map
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
601 m_dir_encoding.erase (load_path_dir (dir));
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
602 return;
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
603 }
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
604 else if (enc.compare ("utf-8"))
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
605 {
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
606 // Check for valid encoding name.
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
607 // FIXME: This will probably not happen very often and opening the
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
608 // encoder doesn't take long.
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
609 // Should we cache working encoding identifiers anyway?
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
610 void *codec
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
611 = octave_iconv_open_wrapper (enc.c_str (), "utf-8");
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
612
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
613 if (codec == reinterpret_cast<void *> (-1))
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
614 {
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
615 if (errno == EINVAL)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
616 error ("dir_encoding: conversion from encoding '%s' "
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
617 "not supported", enc.c_str ());
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
618 else
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
619 error ("dir_encoding: error %d opening encoding '%s'.",
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
620 errno, enc.c_str ());
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
621 }
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
622 else
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
623 octave_iconv_close_wrapper (codec);
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
624 }
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
625
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
626 m_dir_encoding[load_path_dir (dir)] = enc;
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
627
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
628 return;
28973
fdb7c296505a maint: merge stable to default.
John W. Eaton <jwe@octave.org>
parents: 28971 28972
diff changeset
629 }
29127
a948253f9976 maint: strip trailing spaces from code base.
Rik <rik@octave.org>
parents: 29120
diff changeset
630
28972
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
631 octave_value
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
632 input_system::auto_repeat_debug_command (const octave_value_list& args,
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
633 int nargout)
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
634 {
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
635 return set_internal_variable (m_auto_repeat_debug_command, args, nargout,
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
636 "auto_repeat_debug_command");
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
637 }
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
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::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
640 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
641 std::string prompt_string = prompt + "(yes or no) ";
6367
268bfc8a2755 [project @ 2007-02-28 20:16:05 by jwe]
jwe
parents: 6317
diff changeset
642
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
643 while (1)
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
644 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
645 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
646
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
647 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
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 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
650 return true;
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
651 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
652 return false;
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
653 else
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
654 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
655 }
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
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
658 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
659 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
660 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
661
27301
a2b1ba6c92d5 eliminate unnecessary application::interative function
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
662 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
663 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
664 bool eval_error = false;
6979
2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman]
dbateman
parents: 6945
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 try
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
667 {
27335
50216d7a2f6b eliminate static wrapper functions in gh_manager class
John W. Eaton <jwe@octave.org>
parents: 27301
diff changeset
668 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
669 }
29163
8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible.
Rik <rik@octave.org>
parents: 29127
diff changeset
670 catch (const execution_exception& ee)
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
671 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
672 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
673
29163
8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible.
Rik <rik@octave.org>
parents: 29127
diff changeset
674 m_interpreter.handle_exception (ee);
25407
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
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
677 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
678
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
679 // 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
680 // 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
681
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
682 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
683
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
684 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
685 return "\n";
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
686 }
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
687
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
688 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
689 }
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
690
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
691 // 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
692
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
693 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
694 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
695 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
696 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
697
30266
38ee67b5ec9f input.cc: throw error if second argument does not equal 's'
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 29961
diff changeset
698 std::string prompt = args(0).xstring_value ("input: unrecognized argument");
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
699
30266
38ee67b5ec9f input.cc: throw error if second argument does not equal 's'
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 29961
diff changeset
700 bool read_as_string = false;
38ee67b5ec9f input.cc: throw error if second argument does not equal 's'
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 29961
diff changeset
701 if (args.length () == 2) // `input (..., "s")`?
38ee67b5ec9f input.cc: throw error if second argument does not equal 's'
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 29961
diff changeset
702 {
38ee67b5ec9f input.cc: throw error if second argument does not equal 's'
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 29961
diff changeset
703 std::string literal
38ee67b5ec9f input.cc: throw error if second argument does not equal 's'
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 29961
diff changeset
704 = args(1).xstring_value ("input: second argument must be 's'.");
38ee67b5ec9f input.cc: throw error if second argument does not equal 's'
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 29961
diff changeset
705 if (literal.length () != 1 || literal[0] != 's')
38ee67b5ec9f input.cc: throw error if second argument does not equal 's'
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 29961
diff changeset
706 error ("input: second argument must be 's'.");
16395
fc491da603f6 also provide a hook for exiting debugger
John W. Eaton <jwe@octave.org>
parents: 16386
diff changeset
707
30266
38ee67b5ec9f input.cc: throw error if second argument does not equal 's'
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 29961
diff changeset
708 read_as_string = true;
38ee67b5ec9f input.cc: throw error if second argument does not equal 's'
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 29961
diff changeset
709 }
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
710
27444
160930a3e5ee eliminate some calls to global __get_SUBSYSTEM__ functions
John W. Eaton <jwe@octave.org>
parents: 27428
diff changeset
711 output_system& output_sys = m_interpreter.get_output_system ();
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
712
25435
a52e6fb674b1 eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents: 25407
diff changeset
713 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
714
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
715 octave_diary << prompt;
25402
ef2b9d4abf4a eliminate some global variables from tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25392
diff changeset
716
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
717 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
718
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
719 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
720
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
721 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
722 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
723
29654
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
724 std::size_t len = input_buf.length ();
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
725
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
726 octave_diary << input_buf;
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23532
diff changeset
727
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
728 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
729 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
730
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
731 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
732 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
733 // 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
734 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
735 retval(0) = "";
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
736 else
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
737 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
738 }
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
739 else
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
740 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
741 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
742
26113
8a15f3bace49 move eval_string inside interpreter/evaluator class
John W. Eaton <jwe@octave.org>
parents: 26062
diff changeset
743 retval
8a15f3bace49 move eval_string inside interpreter/evaluator class
John W. Eaton <jwe@octave.org>
parents: 26062
diff changeset
744 = 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
745
27037
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
746 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
747
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
748 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
749 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
750 }
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
751
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
752 return retval;
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
753 }
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
754
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
755 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
756 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
757 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
758 }
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
759
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
760 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
761 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
762 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
763 }
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
764
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
765 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
766 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
767 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
768 = 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
769
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
770 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
771 return false;
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
772
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
773 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
774 return true;
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
775 }
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
776
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
777 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
778 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
779 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
780 }
269
0febc87abbd4 [project @ 1994-01-05 08:17:07 by jwe]
jwe
parents: 252
diff changeset
781
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
782 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
783 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
784 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
785 }
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
786
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
787 std::string
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
788 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
789 {
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
790 octave_quit ();
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
791
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
792 eof = false;
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents: 8503
diff changeset
793
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
794 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
795
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
796 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
797 retval = "\n";
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
798
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
799 return retval;
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
800 }
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
801
27527
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27502
diff changeset
802 std::string base_reader::octave_gets (const std::string& prompt, bool& eof)
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
803 {
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
804 octave_quit ();
5142
0f9108f298ab [project @ 2005-02-12 02:29:34 by jwe]
jwe
parents: 5092
diff changeset
805
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
806 eof = false;
16097
2f4fa62089b3 improve end of file handling for lexer input
John W. Eaton <jwe@octave.org>
parents: 16053
diff changeset
807
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
808 std::string retval;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
809
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
810 // 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
811 // printing the prompt.
16349
610617eb84d1 provide pre- and post-input hook functions
John W. Eaton <jwe@octave.org>
parents: 16347
diff changeset
812
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
813 tree_evaluator& tw = m_interpreter.get_evaluator ();
27037
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
814
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
815 event_manager& evmgr = m_interpreter.get_event_manager ();
27261
dccdc3b001a2 eliminate static functions from octave_link class
John W. Eaton <jwe@octave.org>
parents: 27200
diff changeset
816
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
817 if (m_interpreter.interactive ())
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
818 {
27037
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
819 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
820 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
821
27263
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27261
diff changeset
822 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
823
27263
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27261
diff changeset
824 evmgr.set_workspace ();
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
825 }
16349
610617eb84d1 provide pre- and post-input hook functions
John W. Eaton <jwe@octave.org>
parents: 16347
diff changeset
826
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
827 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
828
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
829 input_system& input_sys = m_interpreter.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
830
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
831 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
832
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
833 output_system& output_sys = m_interpreter.get_output_system ();
1755
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1750
diff changeset
834
25435
a52e6fb674b1 eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents: 25407
diff changeset
835 output_sys.reset ();
2618
aa667ac18d12 [project @ 1997-01-23 03:16:28 by jwe]
jwe
parents: 2470
diff changeset
836
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
837 octave_diary << prompt;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
838
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
839 retval = input_sys.interactive_input (prompt, eof);
581
bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe]
jwe
parents: 529
diff changeset
840
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
841 // 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
842 // user input.
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
843 if (retval != "\n"
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
844 && 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
845 {
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
846 load_path& lp = m_interpreter.get_load_path ();
23438
d24d01273bd0 eliminate load-path singleton
John W. Eaton <jwe@octave.org>
parents: 23433
diff changeset
847
d24d01273bd0 eliminate load-path singleton
John W. Eaton <jwe@octave.org>
parents: 23433
diff changeset
848 lp.update ();
8841
c74389115610 auto repeat for debugging commands
John W. Eaton <jwe@octave.org>
parents: 8749
diff changeset
849
27037
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
850 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
851 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
852 else
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
853 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
854 }
28972
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
855 else if (tw.in_debug_repl () && input_sys.auto_repeat_debug_command ())
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
856 {
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
857 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
858 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
859 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
860
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
861 if (retval != "\n")
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
862 {
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
863 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
864 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
865 if (command_history::add (retval))
27529
886df2049d81 only increment command number when complete block of code is parsed
John W. Eaton <jwe@octave.org>
parents: 27527
diff changeset
866 evmgr.append_history (retval);
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
867 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
868
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
869 octave_diary << retval;
3176
fccab8e7d35f [project @ 1998-05-18 20:33:31 by jwe]
jwe
parents: 3165
diff changeset
870
26061
cb3ead3cf859 avoid assertion failure with -D_GLIBCXX_ASSERTIONS
Orion Poplawski <orion@cora.nwra.com>
parents: 25054
diff changeset
871 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
872 octave_diary << "\n";
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
873 }
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
874 else
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
875 octave_diary << "\n";
581
bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe]
jwe
parents: 529
diff changeset
876
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
877 // 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
878 // list has been updated.
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9396
diff changeset
879
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
880 if (m_interpreter.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
881 evmgr.post_input_event ();
16349
610617eb84d1 provide pre- and post-input hook functions
John W. Eaton <jwe@octave.org>
parents: 16347
diff changeset
882
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
883 return retval;
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
884 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
885
24732
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
886 class
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
887 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
888 {
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
889 public:
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
890
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
891 terminal_reader (interpreter& interp)
29335
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
892 : base_reader (interp), m_eof (false), m_input_queue ()
24732
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
893 { }
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
894
27527
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27502
diff changeset
895 std::string get_input (const std::string& prompt, bool& eof);
24732
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
896
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
897 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
898
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
899 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
900
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
901 private:
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
902
29335
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
903 bool m_eof;
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
904 std::queue<std::string> m_input_queue;
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
905
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
906 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
907 };
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
908
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
909 class
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
910 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
911 {
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
912 public:
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
913
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
914 file_reader (interpreter& interp, FILE *f_arg)
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
915 : base_reader (interp), m_file (f_arg)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
916 {
29950
6549fa7558ba eliminate some unnecessary octave:: namespace tags
John W. Eaton <jwe@octave.org>
parents: 29937
diff changeset
917 input_system& input_sys = interp.get_input_system ();
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
918 m_encoding = input_sys.mfile_encoding ();
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
919 }
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
920
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
921 file_reader (interpreter& interp, FILE *f_arg, const std::string& enc)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
922 : base_reader (interp), m_file (f_arg), m_encoding (enc) { }
24732
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
923
27527
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27502
diff changeset
924 std::string get_input (const std::string& prompt, bool& eof);
24732
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
925
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
926 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
927
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
928 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
929
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
930 private:
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
931
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
932 FILE *m_file;
24732
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
933
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
934 std::string m_encoding;
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
935
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
936 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
937 };
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
938
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
939 class
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
940 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
941 {
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
942 public:
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
943
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
944 eval_string_reader (interpreter& interp, const std::string& str)
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
945 : base_reader (interp), 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
946 { }
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
947
27527
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27502
diff changeset
948 std::string get_input (const std::string& prompt, bool& eof);
24732
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
949
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
950 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
951
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
952 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
953
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
954 private:
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
955
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
956 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
957
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
958 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
959 };
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
960
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
961 input_reader::input_reader (interpreter& interp)
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
962 : m_rep (new terminal_reader (interp))
24732
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
963 { }
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
964
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
965 input_reader::input_reader (interpreter& interp, FILE *file)
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
966 : m_rep (new file_reader (interp, file))
24732
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
967 { }
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
968
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
969 input_reader::input_reader (interpreter& interp, FILE *file, const std::string& enc)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
970 : m_rep (new file_reader (interp, file, enc))
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
971 { }
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
972
27502
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
973 input_reader::input_reader (interpreter& interp, const std::string& str)
f62f1170ad98 in base_reader, store reference to interpreter instead of lexer
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
974 : m_rep (new eval_string_reader (interp, str))
24732
f079a0856321 move internal input reader classes out of header file
John W. Eaton <jwe@octave.org>
parents: 24597
diff changeset
975 { }
17731
f79bf671a493 eliminate global LEXER variable
John W. Eaton <jwe@octave.org>
parents: 17323
diff changeset
976
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
977 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
978
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
979 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
980
29335
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
981 // If octave_gets returns multiple lines, we cache the input and
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
982 // return it one line at a time. Multiple input lines may happen when
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
983 // using readline and bracketed paste mode is enabled, for example.
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
984 // Instead of queueing lines here, it might be better to modify the
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
985 // grammar in the parser to handle multiple lines when working
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
986 // interactively. See also bug #59938.
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
987
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
988 std::string
27527
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27502
diff changeset
989 terminal_reader::get_input (const std::string& prompt, bool& eof)
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
990 {
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
991 octave_quit ();
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16187
diff changeset
992
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
993 eof = false;
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16187
diff changeset
994
29335
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
995 if (m_input_queue.empty ())
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
996 {
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
997 std::string input = octave_gets (prompt, m_eof);
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
998
29654
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
999 std::size_t len = input.size ();
29335
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1000
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1001 if (len == 0)
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1002 {
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1003 if (m_eof)
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1004 {
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1005 eof = m_eof;
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1006 return input;
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1007 }
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1008 else
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1009 {
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1010 // Can this happen, or will the string returned from
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1011 // octave_gets always end in a newline character?
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1012
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1013 input = "\n";
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1014 len = 1;
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1015 }
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1016 }
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1017
29654
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
1018 std::size_t beg = 0;
29335
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1019 while (beg < len)
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1020 {
29654
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
1021 std::size_t end = input.find ('\n', beg);
29335
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1022
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1023 if (end == std::string::npos)
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1024 {
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1025 m_input_queue.push (input.substr (beg));
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1026 break;
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1027 }
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1028 else
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1029 {
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1030 m_input_queue.push (input.substr (beg, end-beg+1));
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1031 beg = end + 1;
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1032 }
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1033 }
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1034 }
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1035
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1036 std::string retval = m_input_queue.front ();
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1037 m_input_queue.pop ();
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1038
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1039 if (m_input_queue.empty ())
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1040 eof = m_eof;
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1041
3180f830d396 line buffer input in terminal_reader class
John W. Eaton <jwe@octave.org>
parents: 28972
diff changeset
1042 return retval;
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1043 }
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1044
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
1045 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
1046
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1047 std::string
27527
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27502
diff changeset
1048 file_reader::get_input (const std::string& /*prompt*/, bool& eof)
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1049 {
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1050 octave_quit ();
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16187
diff changeset
1051
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1052 eof = false;
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16187
diff changeset
1053
29937
da7210e30f3e move some utility functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29655
diff changeset
1054 std::string src_str = 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
1055
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1056 std::string mfile_encoding;
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1057
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1058 if (m_encoding.empty ())
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1059 {
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1060 input_system& input_sys = m_interpreter.get_input_system ();
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1061 mfile_encoding = input_sys.mfile_encoding ();
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1062 }
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1063 else
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1064 mfile_encoding = m_encoding;
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1065
27748
5fc630696dc7 Compare locale charset name in lower case (bug #57304).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27529
diff changeset
1066 std::string encoding;
5fc630696dc7 Compare locale charset name in lower case (bug #57304).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27529
diff changeset
1067 if (mfile_encoding.compare ("system") == 0)
5fc630696dc7 Compare locale charset name in lower case (bug #57304).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27529
diff changeset
1068 {
5fc630696dc7 Compare locale charset name in lower case (bug #57304).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27529
diff changeset
1069 encoding = octave_locale_charset_wrapper ();
5fc630696dc7 Compare locale charset name in lower case (bug #57304).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27529
diff changeset
1070 // encoding identifiers should consist of ASCII only characters
5fc630696dc7 Compare locale charset name in lower case (bug #57304).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27529
diff changeset
1071 std::transform (encoding.begin (), encoding.end (), encoding.begin (),
5fc630696dc7 Compare locale charset name in lower case (bug #57304).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27529
diff changeset
1072 ::tolower);
5fc630696dc7 Compare locale charset name in lower case (bug #57304).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27529
diff changeset
1073 }
5fc630696dc7 Compare locale charset name in lower case (bug #57304).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27529
diff changeset
1074 else
5fc630696dc7 Compare locale charset name in lower case (bug #57304).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27529
diff changeset
1075 encoding = 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
1076
25620
467729037209 Strip BOM from UTF-8 encoded .m files (bug #52574).
Markus Mützel <markus.muetzel@gmx.de>
parents: 25441
diff changeset
1077 if (encoding.compare ("utf-8") == 0)
27785
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1078 {
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1079 // Check for BOM and strip it
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1080 if (src_str.compare (0, 3, "\xef\xbb\xbf") == 0)
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1081 src_str.erase (0, 3);
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1082
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1083 // replace invalid portions of the string
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1084 // FIXME: Include file name that corresponds to m_file.
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1085 if (string::u8_validate ("get_input", src_str) > 0)
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1086 warning_with_id ("octave:get_input:invalid_utf8",
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1087 "Invalid UTF-8 byte sequences have been replaced.");
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1088 }
25620
467729037209 Strip BOM from UTF-8 encoded .m files (bug #52574).
Markus Mützel <markus.muetzel@gmx.de>
parents: 25441
diff changeset
1089 else
27785
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1090 {
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1091 // convert encoding to UTF-8 before returning string
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1092 const char *src = src_str.c_str ();
29654
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
1093 std::size_t srclen = src_str.length ();
25361
82445187633e Add support for arbitrary character encodings in m-files (bug #53842).
Markus Mützel <markus.muetzel@gmx.de>
parents: 25054
diff changeset
1094
29654
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
1095 std::size_t length;
27785
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1096 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
1097
27785
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1098 utf8_str = octave_u8_conv_from_encoding (encoding.c_str (), src, srclen,
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1099 &length);
25361
82445187633e Add support for arbitrary character encodings in m-files (bug #53842).
Markus Mützel <markus.muetzel@gmx.de>
parents: 25054
diff changeset
1100
27785
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1101 if (! utf8_str)
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1102 error ("file_reader::get_input: "
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1103 "converting from codepage '%s' to UTF-8: %s",
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1104 encoding.c_str (), std::strerror (errno));
25361
82445187633e Add support for arbitrary character encodings in m-files (bug #53842).
Markus Mützel <markus.muetzel@gmx.de>
parents: 25054
diff changeset
1105
28857
43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier
John W. Eaton <jwe@octave.org>
parents: 28851
diff changeset
1106 unwind_action free_utf8_str ([=] () { ::free (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
1107
27785
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1108 src_str = std::string (reinterpret_cast<char *> (utf8_str), length);
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27748
diff changeset
1109 }
25361
82445187633e Add support for arbitrary character encodings in m-files (bug #53842).
Markus Mützel <markus.muetzel@gmx.de>
parents: 25054
diff changeset
1110
82445187633e Add support for arbitrary character encodings in m-files (bug #53842).
Markus Mützel <markus.muetzel@gmx.de>
parents: 25054
diff changeset
1111 return src_str;
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1112 }
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16187
diff changeset
1113
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
1114 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
1115
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1116 std::string
27527
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27502
diff changeset
1117 eval_string_reader::get_input (const std::string& /*prompt*/, bool& eof)
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1118 {
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1119 octave_quit ();
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16187
diff changeset
1120
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1121 eof = false;
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16187
diff changeset
1122
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1123 std::string retval;
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16187
diff changeset
1124
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24732
diff changeset
1125 retval = m_eval_string;
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16187
diff changeset
1126
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1127 // 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
1128 // 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
1129 m_eval_string = "";
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16187
diff changeset
1130
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1131 if (retval.empty ())
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1132 eof = true;
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16187
diff changeset
1133
23061
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1134 return retval;
aedc662896a3 move input reader classes into octave namespace
John W. Eaton <jwe@octave.org>
parents: 23060
diff changeset
1135 }
29958
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29950
diff changeset
1136
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1137 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
1138 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
1139 @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
1140 @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
1141 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
1142
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1143 For example,
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1144
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1145 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1146 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
1147 @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
1148
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1149 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1150 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
1151
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1152 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1153 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
1154 @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
1155
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1156 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1157 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
1158 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
1159 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
1160
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1161 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
1162 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
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 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
1165 @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
1166 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
1167 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
1168
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1169 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
1170 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
1171 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
1172 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
1173 @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
1174 @end deftypefn */)
529
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 339
diff changeset
1175 {
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 339
diff changeset
1176 int nargin = args.length ();
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 339
diff changeset
1177
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1178 if (nargin < 1 || nargin > 2)
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5794
diff changeset
1179 print_usage ();
529
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 339
diff changeset
1180
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1181 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
1182
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1183 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
1184 }
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 339
diff changeset
1185
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1186 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
1187 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
1188 @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
1189 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
1190
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1191 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
1192
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1193 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
1194 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
1195 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
1196 @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
1197 @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
1198 @end deftypefn */)
5640
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe]
jwe
parents: 5388
diff changeset
1199 {
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe]
jwe
parents: 5388
diff changeset
1200 int nargin = args.length ();
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe]
jwe
parents: 5388
diff changeset
1201
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1202 if (nargin > 1)
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5794
diff changeset
1203 print_usage ();
5640
426719471ac6 [project @ 2006-03-04 06:02:14 by jwe]
jwe
parents: 5388
diff changeset
1204
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1205 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
1206
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1207 std::string prompt;
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1208
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1209 if (nargin == 1)
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1210 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
1211
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1212 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
1213 }
b40b7243a782 new class for caching file contents for debug and echo
John W. Eaton <jwe@octave.org>
parents: 23723
diff changeset
1214
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23532
diff changeset
1215 DEFMETHOD (keyboard, interp, args, ,
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23532
diff changeset
1216 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
1217 @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
1218 @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
1219 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
1220
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1221 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
1222 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
1223 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
1224 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
1225 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
1226 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
1227
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1228 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
1229 @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
1230 @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
1231 @end deftypefn */)
529
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 339
diff changeset
1232 {
27037
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
1233 int nargin = args.length ();
9483
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9482
diff changeset
1234
27037
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
1235 if (nargin > 1)
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
1236 print_usage ();
10186
095a1e670e68 make dbstep work with keyboard function
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1237
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1238 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
1239
27037
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
1240 if (nargin == 1)
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
1241 {
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
1242 std::string prompt
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
1243 = 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
1244
27037
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
1245 tw.keyboard (prompt);
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
1246 }
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
1247 else
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 26884
diff changeset
1248 tw.keyboard ();
529
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 339
diff changeset
1249
20941
a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()".
Rik <rik@octave.org>
parents: 20940
diff changeset
1250 return ovl ();
529
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 339
diff changeset
1251 }
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 339
diff changeset
1252
2234
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe]
jwe
parents: 2205
diff changeset
1253 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
1254 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
1255 @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
1256 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
1257
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1258 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
1259 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
1260 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
1261 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
1262 @end deftypefn */)
2234
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe]
jwe
parents: 2205
diff changeset
1263 {
20819
f428cbe7576f eliminate unnecessary uses of nargin
John W. Eaton <jwe@octave.org>
parents: 20817
diff changeset
1264 if (args.length () != 1)
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1265 print_usage ();
2234
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe]
jwe
parents: 2205
diff changeset
1266
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20853
diff changeset
1267 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20853
diff changeset
1268
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1269 std::string hint = args(0).string_value ();
2234
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe]
jwe
parents: 2205
diff changeset
1270
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1271 int n = 32;
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1272
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1273 string_vector list (n);
20555
f90c8372b7ba eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents: 20239
diff changeset
1274
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1275 int k = 0;
2234
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe]
jwe
parents: 2205
diff changeset
1276
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1277 for (;;)
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1278 {
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1279 std::string cmd = generate_completion (hint, k);
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1280
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1281 if (! cmd.empty ())
20555
f90c8372b7ba eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents: 20239
diff changeset
1282 {
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1283 if (k == n)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10186
diff changeset
1284 {
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1285 n *= 2;
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1286 list.resize (n);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10186
diff changeset
1287 }
2234
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe]
jwe
parents: 2205
diff changeset
1288
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1289 list[k++] = cmd;
20555
f90c8372b7ba eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents: 20239
diff changeset
1290 }
f90c8372b7ba eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents: 20239
diff changeset
1291 else
f90c8372b7ba eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents: 20239
diff changeset
1292 {
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1293 list.resize (k);
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1294 break;
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1295 }
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1296 }
20555
f90c8372b7ba eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents: 20239
diff changeset
1297
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1298 if (nargout > 0)
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1299 {
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1300 if (! list.empty ())
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1301 retval = list;
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1302 else
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1303 retval = "";
2234
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe]
jwe
parents: 2205
diff changeset
1304 }
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe]
jwe
parents: 2205
diff changeset
1305 else
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1306 {
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1307 // 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
1308 // 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
1309 // appear in a single column.
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1310
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1311 int len = list.numel ();
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1312
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1313 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
1314 octave_stdout << list[i] << "\n";
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1315 }
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1316
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1317 octave_completion_matches_called = true;
2234
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe]
jwe
parents: 2205
diff changeset
1318
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe]
jwe
parents: 2205
diff changeset
1319 return retval;
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe]
jwe
parents: 2205
diff changeset
1320 }
a174011c96f2 [project @ 1996-05-17 17:51:20 by jwe]
jwe
parents: 2205
diff changeset
1321
20239
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins
Mike Miller <mtmiller@octave.org>
parents: 20232
diff changeset
1322 /*
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins
Mike Miller <mtmiller@octave.org>
parents: 20232
diff changeset
1323 %!assert (ischar (completion_matches ("")))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins
Mike Miller <mtmiller@octave.org>
parents: 20232
diff changeset
1324 %!assert (ischar (completion_matches ("a")))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins
Mike Miller <mtmiller@octave.org>
parents: 20232
diff changeset
1325 %!assert (ischar (completion_matches (" ")))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins
Mike Miller <mtmiller@octave.org>
parents: 20232
diff changeset
1326 %!assert (isempty (completion_matches (" ")))
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins
Mike Miller <mtmiller@octave.org>
parents: 20232
diff changeset
1327 %!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
1328 %!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
1329 %!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
1330 %!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
1331 %!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
1332
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins
Mike Miller <mtmiller@octave.org>
parents: 20232
diff changeset
1333 %!error completion_matches ()
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins
Mike Miller <mtmiller@octave.org>
parents: 20232
diff changeset
1334 %!error completion_matches (1, 2)
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins
Mike Miller <mtmiller@octave.org>
parents: 20232
diff changeset
1335 */
48284e32530b test: Add tests for 'echo' and 'completion_matches' builtins
Mike Miller <mtmiller@octave.org>
parents: 20232
diff changeset
1336
16879
cc3743a91652 Rename read_readline_init_file to readline_read_init_file.
Rik <rik@octave.org>
parents: 16816
diff changeset
1337 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
1338 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
1339 @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
1340 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
1341
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1342 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
1343 (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
1344
30377
26f2daafa270 doc: Use consistent styling for @ref, @xref, @pxref statements.
Rik <rik@octave.org>
parents: 30354
diff changeset
1345 @xref{Readline Init File,,,readline, GNU Readline Library},
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1346 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
1347 @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
1348 @end deftypefn */)
3189
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
1349 {
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
1350 int nargin = args.length ();
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
1351
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1352 if (nargin > 1)
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1353 print_usage ();
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1354
3189
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
1355 if (nargin == 0)
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1356 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
1357 else
3189
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
1358 {
5872
44f24cf66b95 [project @ 2006-06-30 18:19:20 by jwe]
jwe
parents: 5832
diff changeset
1359 std::string file = args(0).string_value ();
3189
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
1360
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1361 command_editor::read_init_file (file);
3189
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
1362 }
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
1363
20941
a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()".
Rik <rik@octave.org>
parents: 20940
diff changeset
1364 return ovl ();
3189
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
1365 }
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
1366
16880
1aebb613a5ac Rename re_read_readline_init_file to readline_re_read_init_file.
Rik <rik@octave.org>
parents: 16879
diff changeset
1367 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
1368 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
1369 @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
1370 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
1371
30377
26f2daafa270 doc: Use consistent styling for @ref, @xref, @pxref statements.
Rik <rik@octave.org>
parents: 30354
diff changeset
1372 @xref{Readline Init File,,,readline, GNU Readline Library},
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1373 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
1374 @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
1375 @end deftypefn */)
7758
8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1376 {
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1377 if (args.length () != 0)
7758
8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1378 print_usage ();
8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1379
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1380 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
1381
20941
a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()".
Rik <rik@octave.org>
parents: 20940
diff changeset
1382 return ovl ();
7758
8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1383 }
8e14a01ffe9f input.cc (Fre_read_readline_init_file): new function
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1384
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1385 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
1386 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
1387 @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
1388 @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
1389 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
1390 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
1391
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1392 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
1393
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1394 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1395 @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
1396 @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
1397
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1398 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
1399
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1400 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
1401 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
1402 @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
1403 @end deftypefn */)
3498
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe]
jwe
parents: 3484
diff changeset
1404 {
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe]
jwe
parents: 3484
diff changeset
1405 int nargin = args.length ();
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe]
jwe
parents: 3484
diff changeset
1406
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1407 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
1408 print_usage ();
3498
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe]
jwe
parents: 3484
diff changeset
1409
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1410 octave_value user_data;
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1411
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1412 if (nargin == 2)
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1413 user_data = args(1);
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1414
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1415 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
1416
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1417 hook_function hook_fcn (args(0), user_data);
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1418
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1419 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
1420
21127
df7891224709 maint: Use "return ovl (...)" in DEFUN macros.
Rik <rik@octave.org>
parents: 21100
diff changeset
1421 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
1422 }
3498
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe]
jwe
parents: 3484
diff changeset
1423
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1424 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
1425 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
1426 @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
1427 @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
1428 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
1429 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
1430 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
1431 @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
1432 @end deftypefn */)
9215
1500d0197484 allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents: 9134
diff changeset
1433 {
1500d0197484 allow multiple input event hook functions to be installed simultaneously
John W. Eaton <jwe@octave.org>
parents: 9134
diff changeset
1434 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
1435
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1436 if (nargin < 1 || nargin > 2)
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1437 print_usage ();
16347
bf8397caeff1 allow add_input_event_hook to accept function handles
John W. Eaton <jwe@octave.org>
parents: 16336
diff changeset
1438
26358
d527c6111425 input.cc: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents: 26193
diff changeset
1439 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
1440
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1441 bool warn = (nargin < 2);
3498
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe]
jwe
parents: 3484
diff changeset
1442
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1443 input_system& input_sys = interp.get_input_system ();
3498
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe]
jwe
parents: 3484
diff changeset
1444
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1445 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
1446 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
1447 hook_fcn_id.c_str ());
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1448
20941
a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()".
Rik <rik@octave.org>
parents: 20940
diff changeset
1449 return ovl ();
3498
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe]
jwe
parents: 3484
diff changeset
1450 }
e391aeef2b3c [project @ 2000-01-31 03:17:14 by jwe]
jwe
parents: 3484
diff changeset
1451
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1452 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
1453 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
1454 @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
1455 @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
1456 @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
1457 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
1458
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1459 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
1460 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
1461
29117
10a35049bad7 doc: Cleanup Texinfo macros use in documentation.
Rik <rik@octave.org>
parents: 28973
diff changeset
1462 The default value of the primary prompt string is
10a35049bad7 doc: Cleanup Texinfo macros use in documentation.
Rik <rik@octave.org>
parents: 28973
diff changeset
1463 @qcode{'octave:@backslashchar{}#> '}. To change it, use a command like
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1464
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1465 @example
29117
10a35049bad7 doc: Cleanup Texinfo macros use in documentation.
Rik <rik@octave.org>
parents: 28973
diff changeset
1466 PS1 ('\u@@\H> ')
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1467 @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
1468
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1469 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1470 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
1471 @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
1472 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
1473 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
1474
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1475 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
1476 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
1477
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1478 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1479 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
1480 @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
1481
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1482 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1483 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
1484
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1485 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
1486 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
1487 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
1488 @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
1489 @end deftypefn */)
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
1490 {
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1491 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
1492
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1493 return input_sys.PS1 (args, nargout);
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
1494 }
2181
138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe]
jwe
parents: 2114
diff changeset
1495
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1496 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
1497 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
1498 @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
1499 @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
1500 @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
1501 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
1502
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1503 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
1504 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
1505 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
1506 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
1507 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
1508
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1509 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
1510 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
1511 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
1512 @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
1513 @end deftypefn */)
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
1514 {
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1515 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
1516
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1517 return input_sys.PS2 (args, nargout);
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
1518 }
2181
138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe]
jwe
parents: 2114
diff changeset
1519
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1520 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
1521 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
1522 @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
1523 @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
1524 @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
1525 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
1526 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
1527
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1528 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
1529
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21920
diff changeset
1530 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
1531 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
1532 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
1533 @end deftypefn */)
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
1534 {
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1535 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
1536
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1537 return input_sys.completion_append_char (args, nargout);
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
1538 }
3019
92aa3d651723 [project @ 1997-06-03 22:07:16 by jwe]
jwe
parents: 3016
diff changeset
1539
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1540 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
1541 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
1542 @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
1543 @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
1544 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
1545 @end deftypefn */)
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
1546 {
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
1547 int nargin = args.length ();
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
1548
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1549 if (nargin > 1)
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1550 print_usage ();
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1551
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
1552 if (nargin == 0)
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
1553 Vdrawnow_requested = true;
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20756
diff changeset
1554 else
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
1555 Vdrawnow_requested = args(0).bool_value ();
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
1556
20941
a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()".
Rik <rik@octave.org>
parents: 20940
diff changeset
1557 return ovl ();
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
1558 }
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents: 6206
diff changeset
1559
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1560 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
1561 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
1562 @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
1563 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
1564 @end deftypefn */)
7294
fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe]
jwe
parents: 7097
diff changeset
1565 {
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1566 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
1567
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1568 return input_sys.gud_mode (args, nargout);
7294
fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe]
jwe
parents: 7097
diff changeset
1569 }
25361
82445187633e Add support for arbitrary character encodings in m-files (bug #53842).
Markus Mützel <markus.muetzel@gmx.de>
parents: 25054
diff changeset
1570
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1571 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
1572 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
1573 @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
1574 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
1575 @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
1576 {
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1577 input_system& input_sys = interp.get_input_system ();
7294
fb902b3b2a5d [project @ 2007-12-11 18:55:46 by jwe]
jwe
parents: 7097
diff changeset
1578
25407
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1579 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
1580 }
ab10403a0b50 new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents: 25402
diff changeset
1581
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1582 DEFMETHOD (dir_encoding, interp, args, nargout,
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1583 doc: /* -*- texinfo -*-
30354
c980f938fdd8 doc: grammarcheck C++ files in libinterp/ directory ahead of 7.1 release.
Rik <rik@octave.org>
parents: 30266
diff changeset
1584 @deftypefn {} {@var{current_encoding} =} dir_encoding (@var{dir})
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1585 @deftypefnx {} {@var{prev_encoding} =} dir_encoding (@var{dir}, @var{encoding})
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1586 @deftypefnx {} {} dir_encoding (@dots{})
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1587 Set and query the @var{encoding} that is used for reading m-files in @var{dir}.
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1588
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1589 That encoding overrides the (globally set) m-file encoding.
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1590
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1591 The string @var{DIR} must match the form how the directory would appear in the
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1592 load path.
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1593
30354
c980f938fdd8 doc: grammarcheck C++ files in libinterp/ directory ahead of 7.1 release.
Rik <rik@octave.org>
parents: 30266
diff changeset
1594 The @var{encoding} must be a valid encoding identifier or @qcode{"delete"}. In
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1595 the latter case, the (globally set) m-file encoding will be used for the given
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1596 @var{dir}.
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1597
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1598 The currently or previously used encoding is returned in @var{current_encoding}
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1599 or @var{prev_encoding}, respectively. The output argument must be explicitly
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1600 requested.
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1601
28971
02b97abbc6fc maint: rename .oct_config files to .oct-config
John W. Eaton <jwe@octave.org>
parents: 28953
diff changeset
1602 The directory encoding is automatically read from the file @file{.oct-config}
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1603 when a new path is added to the load path (for example with @code{addpath}).
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1604 To set the encoding for all files in the same folder, that file must contain
30354
c980f938fdd8 doc: grammarcheck C++ files in libinterp/ directory ahead of 7.1 release.
Rik <rik@octave.org>
parents: 30266
diff changeset
1605 a line starting with @qcode{"encoding="} followed by the encoding identifier.
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1606
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1607 For example to set the file encoding for all files in the same folder to
28971
02b97abbc6fc maint: rename .oct_config files to .oct-config
John W. Eaton <jwe@octave.org>
parents: 28953
diff changeset
1608 ISO 8859-1 (Latin-1), create a file @file{.oct-config} with the following
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1609 content:
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1610
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1611 @example
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1612 encoding=iso8859-1
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1613 @end example
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1614
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1615 If the file encoding is changed after the files have already been parsed, the
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1616 files have to be parsed again for that change to take effect. That can be done
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1617 with the command @code{clear all}.
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1618
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1619 @seealso{addpath, path}
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1620 @end deftypefn */)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1621 {
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1622 int nargin = args.length ();
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1623
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1624 if (nargin < 1 || nargin > 2)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1625 print_usage ();
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1626
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1627 std::string dir
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1628 = args(0).xstring_value ("dir_encoding: DIR must be a string");
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1629
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1630 octave_value retval;
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1631
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1632 input_system& input_sys = interp.get_input_system ();
28953
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1633
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1634 if (nargout > 0)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1635 retval = input_sys.dir_encoding (dir);
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1636
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1637 if (nargin > 1)
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1638 {
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1639 std::string encoding
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1640 = args(1).xstring_value ("dir_encoding: ENCODING must be a string");
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1641
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1642 input_sys.set_dir_encoding (dir, encoding);
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1643 }
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1644
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1645 return ovl (retval);
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1646
dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28905
diff changeset
1647 }
28973
fdb7c296505a maint: merge stable to default.
John W. Eaton <jwe@octave.org>
parents: 28971 28972
diff changeset
1648
28972
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1649 DEFMETHOD (auto_repeat_debug_command, interp, args, nargout,
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1650 doc: /* -*- texinfo -*-
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1651 @deftypefn {} {@var{val} =} auto_repeat_debug_command ()
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1652 @deftypefnx {} {@var{old_val} =} auto_repeat_debug_command (@var{new_val})
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1653 @deftypefnx {} {} auto_repeat_debug_command (@var{new_val}, "local")
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1654 Query or set the internal variable that controls whether debugging
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1655 commands are automatically repeated when the input line is empty (typing
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1656 just @key{RET}).
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1657
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1658 When called from inside a function with the @qcode{"local"} option, the
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1659 variable is changed locally for the function and any subroutines it calls.
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1660 The original variable value is restored when exiting the function.
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1661 @end deftypefn */)
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1662 {
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29960
diff changeset
1663 input_system& input_sys = interp.get_input_system ();
28972
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1664
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1665 return input_sys.auto_repeat_debug_command (args, nargout);
a00eca5d6cbe allow auto repeat of debug commands to be disabled
John W. Eaton <jwe@octave.org>
parents: 28707
diff changeset
1666 }
29958
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29950
diff changeset
1667
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29950
diff changeset
1668 OCTAVE_NAMESPACE_END