Mercurial > hg > octave-nkf

annotate libinterp/parse-tree/lex.ll @ 16155:0259254a3ccc classdef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: periodic merge of default to classdef * lex.h, lex.ll, parse.h, oct-parse.yy: Resolve conflicts by adapting classdef changes to new octave_parser and lexical_feedback classes.
author John W. Eaton <jwe@octave.org>
date Thu, 28 Feb 2013 02:04:24 -0500
parents 6ea536cb7360 aa5e1e8dce66
children a8f9eb92fa6e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1994
c2d20f365b84 [project @ 1996-03-03 01:19:32 by jwe]
jwe
parents: 1884
diff changeset
1 /*
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 14074
diff changeset
3 Copyright (C) 1993-2012 John W. Eaton
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
4
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
5 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
6
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6547
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6547
diff changeset
10 option) any later version.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
11
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
15 for more details.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
16
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6547
diff changeset
18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6547
diff changeset
19 <http://www.gnu.org/licenses/>.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
20
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
21 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
22
16150
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
23 /*
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
24 We are using the pure parser interface and the reentrant lexer
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
25 interface but the Octave parser and lexer are NOT properly
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
26 reentrant because both still use many global variables. It should be
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
27 safe to create a parser object and call it while anotehr parser
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
28 object is active (to parse a callback function while the main
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
29 interactive parser is waiting for input, for example) if you take
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
30 care to properly save and restore (typically with an unwind_protect
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
31 object) relevant global values before and after the nested call.
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
32 */
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
33
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
34 %option prefix = "octave_"
16146
b6050fc0a2d9 use %option noyywrap
John W. Eaton <jwe@octave.org>
parents: 16139
diff changeset
35 %option noyywrap
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
36 %option reentrant
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
37 %option bison-bridge
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
38
10019
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
39 %top {
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
40 #ifdef HAVE_CONFIG_H
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
41 #include <config.h>
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
42 #endif
10411
479cc8a0a846 use gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
43
10019
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
44 }
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
45
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
46 %s COMMAND_START
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
47 %s MATRIX_START
4240
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
48
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
49 %x SCRIPT_FILE_BEGIN
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
50 %x FUNCTION_FILE_BEGIN
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
51 %x CLASSDEF_FILE_BEGIN
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
52
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
53 %{
240
a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe]
jwe
parents: 216
diff changeset
54
1341
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe]
jwe
parents: 1315
diff changeset
55 #include <cctype>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe]
jwe
parents: 1315
diff changeset
56 #include <cstring>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe]
jwe
parents: 1315
diff changeset
57
8950
d865363208d6 include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
58 #include <iostream>
8001
ff9e7873f8ea improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents: 7898
diff changeset
59 #include <set>
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
60 #include <sstream>
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
61 #include <string>
4214
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
62 #include <stack>
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
63
4093
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe]
jwe
parents: 4064
diff changeset
64 #include <sys/types.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe]
jwe
parents: 4064
diff changeset
65 #include <unistd.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe]
jwe
parents: 4064
diff changeset
66
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2900
diff changeset
67 #include "cmd-edit.h"
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4131
diff changeset
68 #include "quit.h"
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
69 #include "lo-mappers.h"
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2900
diff changeset
70
16154
aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment.
John W. Eaton <jwe@octave.org>
parents: 16150
diff changeset
71 // These would be alphabetical, but oct-parse.h must be included before
aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment.
John W. Eaton <jwe@octave.org>
parents: 16150
diff changeset
72 // oct-gperf.h and oct-parse.h must be included after token.h and the tree
aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment.
John W. Eaton <jwe@octave.org>
parents: 16150
diff changeset
73 // class declarations. We can't include oct-parse.h in oct-gperf.h
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
74 // because it may not be protected to allow it to be included multiple
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
75 // times.
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
76
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
77 #include "Cell.h"
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
78 #include "comment-list.h"
2181
138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe]
jwe
parents: 2167
diff changeset
79 #include "defun.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
80 #include "error.h"
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
81 #include "gripes.h"
1351
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1341
diff changeset
82 #include "input.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
83 #include "lex.h"
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
84 #include "ov.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
85 #include "parse.h"
14329
8d1ae996c122 also save and restore symbol table context in parser (bug #35448)
John W. Eaton <jwe@octave.org>
parents: 14294
diff changeset
86 #include "parse-private.h"
2987
ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe]
jwe
parents: 2982
diff changeset
87 #include "pt-all.h"
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
88 #include "symtab.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
89 #include "token.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
90 #include "toplev.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
91 #include "utils.h"
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
92 #include "variables.h"
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents: 9476
diff changeset
93 #include <oct-parse.h>
2492
06595bc7f2d0 [project @ 1996-11-09 00:13:50 by jwe]
jwe
parents: 2375
diff changeset
94 #include <oct-gperf.h>
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
95
10426
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
96 #if defined (GNULIB_NAMESPACE)
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
97 // Calls to the following functions appear in the generated output from
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
98 // flex without the namespace tag. Redefine them so we will use them
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
99 // via the gnulib namespace.
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
100 #define fprintf GNULIB_NAMESPACE::fprintf
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
101 #define fwrite GNULIB_NAMESPACE::fwrite
14161
f4b5a2f899d3 check in change accidentally omitted from previuos changeset
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
102 #define isatty GNULIB_NAMESPACE::isatty
10426
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
103 #define malloc GNULIB_NAMESPACE::malloc
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
104 #define realloc GNULIB_NAMESPACE::realloc
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
105 #endif
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
106
2716
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
107 #if ! (defined (FLEX_SCANNER) \
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
108 && defined (YY_FLEX_MAJOR_VERSION) && YY_FLEX_MAJOR_VERSION >= 2 \
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
109 && defined (YY_FLEX_MINOR_VERSION) && YY_FLEX_MINOR_VERSION >= 5)
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
110 #error lex.l requires flex version 2.5.4 or later
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
111 #endif
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
112
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
113 #define YY_EXTRA_TYPE lexical_feedback *
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
114 #define curr_lexer yyextra
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
115
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
116 // Arrange to get input via readline.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
117
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
118 #ifdef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
119 #undef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
120 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
121 #define YY_INPUT(buf, result, max_size) \
16120
4b68eb9b98b0 move octave_read lexer helper function to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16119
diff changeset
122 result = curr_lexer->octave_read (buf, max_size)
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
123
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
124 // Try to avoid crashing out completely on fatal scanner errors.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
125
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
126 #ifdef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
127 #undef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
128 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
129 #define YY_FATAL_ERROR(msg) \
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
130 (yyget_extra (yyscanner))->fatal_error (msg)
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
131
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
132 #define DISPLAY_TOK_AND_RETURN(tok) \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
133 do \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
134 { \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
135 int tok_val = tok; \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
136 if (Vdisplay_tokens) \
16118
f8e463523229 move more static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16117
diff changeset
137 curr_lexer->display_token (tok_val); \
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
138 if (lexer_debug_flag) \
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
139 { \
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
140 std::cerr << "R: "; \
16118
f8e463523229 move more static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16117
diff changeset
141 curr_lexer->display_token (tok_val); \
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
142 std::cerr << std::endl; \
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
143 } \
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
144 return tok_val; \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
145 } \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
146 while (0)
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
147
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
148 #define COUNT_TOK_AND_RETURN(tok) \
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
149 do \
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
150 { \
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
151 Vtoken_count++; \
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
152 DISPLAY_TOK_AND_RETURN (tok); \
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
153 } \
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
154 while (0)
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
155
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
156 #define TOK_RETURN(tok) \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
157 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
158 { \
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
159 curr_lexer->current_input_column += yyleng; \
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
160 curr_lexer->quote_is_transpose = false; \
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
161 curr_lexer->convert_spaces_to_comma = true; \
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
162 COUNT_TOK_AND_RETURN (tok); \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
163 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
164 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
165
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
166 #define TOK_PUSH_AND_RETURN(name, tok) \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
167 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
168 { \
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
169 curr_lexer->push_token \
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
170 (new token (name, curr_lexer->input_line_number, \
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
171 curr_lexer->current_input_column)); \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
172 TOK_RETURN (tok); \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
173 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
174 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
175
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
176 #define BIN_OP_RETURN_INTERNAL(tok, convert, bos, qit) \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
177 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
178 { \
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
179 curr_lexer->push_token \
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
180 (new token (curr_lexer->input_line_number, \
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
181 curr_lexer->current_input_column)); \
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
182 curr_lexer->current_input_column += yyleng; \
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
183 curr_lexer->quote_is_transpose = qit; \
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
184 curr_lexer->convert_spaces_to_comma = convert; \
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
185 curr_lexer->looking_for_object_index = false; \
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
186 curr_lexer->at_beginning_of_statement = bos; \
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
187 COUNT_TOK_AND_RETURN (tok); \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
188 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
189 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
190
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
191 #define XBIN_OP_RETURN_INTERNAL(tok, convert, bos, qit) \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
192 do \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
193 { \
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
194 curr_lexer->gripe_matlab_incompatible_operator (yytext); \
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
195 BIN_OP_RETURN_INTERNAL (tok, convert, bos, qit); \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
196 } \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
197 while (0)
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
198
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
199 #define BIN_OP_RETURN(tok, convert, bos) \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
200 do \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
201 { \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
202 BIN_OP_RETURN_INTERNAL (tok, convert, bos, false); \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
203 } \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
204 while (0)
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
205
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
206 #define XBIN_OP_RETURN(tok, convert, bos) \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
207 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
208 { \
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
209 curr_lexer->gripe_matlab_incompatible_operator (yytext); \
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
210 BIN_OP_RETURN (tok, convert, bos); \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
211 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
212 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
213
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
214 #define LEXER_DEBUG(pattern) \
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
215 do \
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
216 { \
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
217 if (lexer_debug_flag) \
16118
f8e463523229 move more static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16117
diff changeset
218 curr_lexer->lexer_debug (pattern, yytext); \
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
219 } \
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
220 while (0)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
221
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
222 static bool Vdisplay_tokens = false;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
223
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
224 static unsigned int Vtoken_count = 0;
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
225
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
226 // Internal variable for lexer debugging state.
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
227 static bool lexer_debug_flag = false;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
228
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
229 // Forward declarations for functions defined at the bottom of this
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
230 // file that are needed inside the lexer actions.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
231
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
232 static std::string strip_trailing_whitespace (char *s);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
233
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
234 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
235
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
236 D [0-9]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
237 S [ \t]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
238 NL ((\n)|(\r)|(\r\n))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
239 SNL ({S}|{NL})
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
240 EL (\.\.\.)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
241 BS (\\)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
242 CONT ({EL}|{BS})
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
243 Im [iIjJ]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
244 CCHAR [#%]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
245 COMMENT ({CCHAR}.*{NL})
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
246 SNLCMT ({SNL}|{COMMENT})
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
247 NOT ((\~)|(\!))
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
248 POW ((\*\*)|(\^))
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
249 EPOW (\.{POW})
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
250 IDENT ([_$a-zA-Z][_$a-zA-Z0-9]*)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
251 EXPON ([DdEe][+-]?{D}+)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
252 NUMBER (({D}+\.?{D}*{EXPON}?)|(\.{D}+{EXPON}?)|(0[xX][0-9a-fA-F]+))
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
253 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
254
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
255 %{
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
256 // Make script and function files start with a bogus token. This makes
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
257 // the parser go down a special path.
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
258 %}
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
259
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
260 <SCRIPT_FILE_BEGIN>. {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
261 LEXER_DEBUG ("<SCRIPT_FILE_BEGIN>.");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
262
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
263 BEGIN (INITIAL);
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
264 curr_lexer->xunput (yytext[0]);
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
265 COUNT_TOK_AND_RETURN (SCRIPT_FILE);
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
266 }
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
267
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
268 <FUNCTION_FILE_BEGIN>. {
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
269 LEXER_DEBUG ("<FUNCTION_FILE_BEGIN>.");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
270
4323
0990c9b77109 [project @ 2003-02-14 07:36:26 by jwe]
jwe
parents: 4318
diff changeset
271 BEGIN (INITIAL);
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
272 curr_lexer->xunput (yytext[0]);
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
273 COUNT_TOK_AND_RETURN (FUNCTION_FILE);
4238
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
274 }
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
275
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
276 <CLASSDEF_FILE_BEGIN>. {
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
277 LEXER_DEBUG ("<CLASSDEF_FILE_BEGIN>.");
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
278
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
279 BEGIN (INITIAL);
16155
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
280 curr_lexer->xunput (yytext[0], yytext);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
281 COUNT_TOK_AND_RETURN (CLASSDEF_FILE);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
282 }
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
283
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
284 %{
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
285 // Help and other command-style functions.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
286 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
287
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
288 <COMMAND_START>{NL} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
289 LEXER_DEBUG ("<COMMAND_START>{NL}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
290
4323
0990c9b77109 [project @ 2003-02-14 07:36:26 by jwe]
jwe
parents: 4318
diff changeset
291 BEGIN (INITIAL);
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
292 curr_lexer->input_line_number++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
293 curr_lexer->current_input_column = 1;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
294
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
295 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
296 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
297 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
298 curr_lexer->at_beginning_of_statement = true;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
299
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
300 COUNT_TOK_AND_RETURN ('\n');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
301 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
302
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
303 <COMMAND_START>[\;\,] {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
304 LEXER_DEBUG ("<COMMAND_START>[\\;\\,]");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
305
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
306 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
307 curr_lexer->at_beginning_of_statement = true;
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
308
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
309 BEGIN (INITIAL);
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
310
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
311 if (strcmp (yytext, ",") == 0)
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
312 TOK_RETURN (',');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
313 else
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
314 TOK_RETURN (';');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
315 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
316
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
317 <COMMAND_START>[\"\'] {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
318 LEXER_DEBUG ("<COMMAND_START>[\\\"\\']");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
319
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
320 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
321
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
322 curr_lexer->current_input_column++;
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
323 int tok = curr_lexer->handle_string (yytext[0]);
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
324
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
325 COUNT_TOK_AND_RETURN (tok);
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
326 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
327
4923
b11223097ad4 [project @ 2004-08-02 16:33:11 by jwe]
jwe
parents: 4910
diff changeset
328 <COMMAND_START>[^#% \t\r\n\;\,\"\'][^ \t\r\n\;\,]*{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
329 LEXER_DEBUG ("<COMMAND_START>[^#% \\t\\r\\n\\;\\,\\\"\\'][^ \\t\\r\\n\\;\\,]*{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
330
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
331 std::string tok = strip_trailing_whitespace (yytext);
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
332
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
333 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
334 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
335
5279
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe]
jwe
parents: 5225
diff changeset
336 TOK_PUSH_AND_RETURN (tok, SQ_STRING);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
337 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
338
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
339 %{
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
340 // For this and the next two rules, we're looking at ']', and we
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
341 // need to know if the next token is '=' or '=='.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
342 //
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
343 // It would have been so much easier if the delimiters were simply
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
344 // different for the expression on the left hand side of the equals
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
345 // operator.
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
346 //
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
347 // It's also a pain in the ass to decide whether to insert a comma
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
348 // after seeing a ']' character...
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
349
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
350 // FIXME -- we need to handle block comments here.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
351 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
352
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
353 <MATRIX_START>{SNLCMT}*\]{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
354 LEXER_DEBUG ("<MATRIX_START>{SNLCMT}*\\]{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
355
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
356 curr_lexer->scan_for_comments (yytext);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
357 curr_lexer->fixup_column_count (yytext);
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
358
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
359 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
360
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
361 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
362 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
363
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
364 int c = yytext[yyleng-1];
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
365 bool cont_is_spc = (curr_lexer->eat_continuation () != lexical_feedback::NO_WHITESPACE);
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
366 bool spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
367 int tok_to_return = curr_lexer->handle_close_bracket (spc_gobbled, ']');
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
368
5345
2781568bf951 [project @ 2005-05-10 05:31:12 by jwe]
jwe
parents: 5307
diff changeset
369 if (spc_gobbled)
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
370 curr_lexer->xunput (' ');
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
371
5345
2781568bf951 [project @ 2005-05-10 05:31:12 by jwe]
jwe
parents: 5307
diff changeset
372 COUNT_TOK_AND_RETURN (tok_to_return);
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
373 }
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
374
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
375 %{
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
376 // FIXME -- we need to handle block comments here.
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
377 %}
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
378
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
379 <MATRIX_START>{SNLCMT}*\}{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
380 LEXER_DEBUG ("<MATRIX_START>{SNLCMT}*\\}{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
381
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
382 curr_lexer->scan_for_comments (yytext);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
383 curr_lexer->fixup_column_count (yytext);
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
384
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
385 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
386
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
387 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
388 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
389
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
390 int c = yytext[yyleng-1];
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
391 bool cont_is_spc = (curr_lexer->eat_continuation () != lexical_feedback::NO_WHITESPACE);
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
392 bool spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
393 int tok_to_return = curr_lexer->handle_close_bracket (spc_gobbled, '}');
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
394
5345
2781568bf951 [project @ 2005-05-10 05:31:12 by jwe]
jwe
parents: 5307
diff changeset
395 if (spc_gobbled)
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
396 curr_lexer->xunput (' ');
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
397
5345
2781568bf951 [project @ 2005-05-10 05:31:12 by jwe]
jwe
parents: 5307
diff changeset
398 COUNT_TOK_AND_RETURN (tok_to_return);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
399 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
400
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
401 %{
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
402 // Commas are element separators in matrix constants. If we don't
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
403 // check for continuations here we can end up inserting too many
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
404 // commas.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
405 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
406
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
407 <MATRIX_START>{S}*\,{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
408 LEXER_DEBUG ("<MATRIX_START>{S}*\\,{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
409
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
410 curr_lexer->current_input_column += yyleng;
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
411
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
412 int tmp = curr_lexer->eat_continuation ();
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
413
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
414 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
415 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
416 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
417 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
418
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
419 if (! curr_lexer->looking_at_object_index.front ())
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
420 {
16106
031117f4db7c use enum for values returned by eat_continuation and eat_whitespace
John W. Eaton <jwe@octave.org>
parents: 16105
diff changeset
421 if ((tmp & lexical_feedback::NEWLINE) == lexical_feedback::NEWLINE)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
422 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
423 curr_lexer->maybe_warn_separator_insert (';');
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
424
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
425 curr_lexer->xunput (';');
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
426 }
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
427 }
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
428
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
429 COUNT_TOK_AND_RETURN (',');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
430 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
431
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
432 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
433 // In some cases, spaces in matrix constants can turn into commas.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
434 // If commas are required, spaces are not important in matrix
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
435 // constants so we just eat them. If we don't check for continuations
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
436 // here we can end up inserting too many commas.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
437 %}
430
8464d5778a09 [project @ 1994-05-25 08:33:54 by jwe]
jwe
parents: 428
diff changeset
438
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
439 <MATRIX_START>{S}+ {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
440 LEXER_DEBUG ("<MATRIX_START>{S}+");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
441
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
442 curr_lexer->current_input_column += yyleng;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
443
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
444 curr_lexer->at_beginning_of_statement = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
445
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
446 int tmp = curr_lexer->eat_continuation ();
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
447
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
448 if (! curr_lexer->looking_at_object_index.front ())
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
449 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
450 bool bin_op = curr_lexer->next_token_is_bin_op (true);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
451 bool postfix_un_op = curr_lexer->next_token_is_postfix_unary_op (true);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
452 bool sep_op = curr_lexer->next_token_is_sep_op ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
453
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
454 if (! (postfix_un_op || bin_op || sep_op)
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
455 && curr_lexer->nesting_level.is_bracket_or_brace ()
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
456 && curr_lexer->convert_spaces_to_comma)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
457 {
16106
031117f4db7c use enum for values returned by eat_continuation and eat_whitespace
John W. Eaton <jwe@octave.org>
parents: 16105
diff changeset
458 if ((tmp & lexical_feedback::NEWLINE) == lexical_feedback::NEWLINE)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
459 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
460 curr_lexer->maybe_warn_separator_insert (';');
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
461
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
462 curr_lexer->xunput (';');
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
463 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
464
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
465 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
466 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
467 curr_lexer->looking_for_object_index = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
468
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
469 curr_lexer->maybe_warn_separator_insert (',');
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
470
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
471 COUNT_TOK_AND_RETURN (',');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
472 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
473 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
474 }
430
8464d5778a09 [project @ 1994-05-25 08:33:54 by jwe]
jwe
parents: 428
diff changeset
475
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
476 %{
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
477 // Semicolons are handled as row seprators in matrix constants. If we
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
478 // don't eat whitespace here we can end up inserting too many
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
479 // semicolons.
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
480
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
481 // FIXME -- we need to handle block comments here.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
482 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
483
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
484 <MATRIX_START>{SNLCMT}*;{SNLCMT}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
485 LEXER_DEBUG ("<MATRIX_START>{SNLCMT}*;{SNLCMT}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
486
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
487 curr_lexer->scan_for_comments (yytext);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
488 curr_lexer->fixup_column_count (yytext);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
489 curr_lexer->eat_whitespace ();
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
490
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
491 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
492 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
493 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
494 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
495
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
496 COUNT_TOK_AND_RETURN (';');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
497 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
498
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
499 %{
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
500 // In some cases, new lines can also become row separators. If we
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
501 // don't eat whitespace here we can end up inserting too many
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
502 // semicolons.
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
503
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
504 // FIXME -- we need to handle block comments here.
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
505 %}
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
506
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
507 <MATRIX_START>{S}*{COMMENT}{SNLCMT}* |
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
508 <MATRIX_START>{S}*{NL}{SNLCMT}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
509 LEXER_DEBUG ("<MATRIX_START>{S}*{COMMENT}{SNLCMT}*|<MATRIX_START>{S}*{NL}{SNLCMT}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
510
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
511 curr_lexer->scan_for_comments (yytext);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
512 curr_lexer->fixup_column_count (yytext);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
513 curr_lexer->eat_whitespace ();
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
514
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
515 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
516 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
517 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
518
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
519 if (curr_lexer->nesting_level.none ())
4476
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
520 return LEXICAL_ERROR;
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
521
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
522 if (! curr_lexer->looking_at_object_index.front ()
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
523 && curr_lexer->nesting_level.is_bracket_or_brace ())
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
524 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
525 curr_lexer->maybe_warn_separator_insert (';');
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
526
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
527 COUNT_TOK_AND_RETURN (';');
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
528 }
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
529 }
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
530
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
531 \[{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
532 LEXER_DEBUG ("\\[{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
533
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
534 curr_lexer->nesting_level.bracket ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
535
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
536 curr_lexer->looking_at_object_index.push_front (false);
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
537
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
538 curr_lexer->current_input_column += yyleng;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
539 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
540 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
541 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
542 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
543
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
544 if (curr_lexer->defining_func
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
545 && ! curr_lexer->parsed_function_name.top ())
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
546 curr_lexer->looking_at_return_list = true;
5615
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5570
diff changeset
547 else
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
548 curr_lexer->looking_at_matrix_or_assign_lhs = true;
5615
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5570
diff changeset
549
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
550 promptflag--;
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
551 curr_lexer->eat_whitespace ();
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
552
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
553 curr_lexer->bracketflag++;
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
554 BEGIN (MATRIX_START);
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
555 COUNT_TOK_AND_RETURN ('[');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
556 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
557
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
558 \] {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
559 LEXER_DEBUG ("\\]");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
560
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
561 curr_lexer->nesting_level.remove ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
562
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
563 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
564
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
565 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
566 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
567
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
568 TOK_RETURN (']');
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
569 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
570
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
571 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
572 // Imaginary numbers.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
573 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
574
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
575 {NUMBER}{Im} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
576 LEXER_DEBUG ("{NUMBER}{Im}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
577
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
578 curr_lexer->handle_number ();
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
579 COUNT_TOK_AND_RETURN (IMAG_NUM);
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
580 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
581
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
582 %{
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
583 // Real numbers. Don't grab the '.' part of a dot operator as part of
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
584 // the constant.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
585 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
586
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
587 {D}+/\.[\*/\\^\'] |
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
588 {NUMBER} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
589 LEXER_DEBUG ("{D}+/\\.[\\*/\\^\\']|{NUMBER}");
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
590 curr_lexer->handle_number ();
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
591 COUNT_TOK_AND_RETURN (NUM);
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
592 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
593
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
594 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
595 // Eat whitespace. Whitespace inside matrix constants is handled by
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
596 // the <MATRIX_START> start state code above.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
597 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
598
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
599 {S}* {
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
600 curr_lexer->current_input_column += yyleng;
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
601 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
602
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
603 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
604 // Continuation lines. Allow comments after continuations.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
605 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
606
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
607 {CONT}{S}*{NL} |
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
608 {CONT}{S}*{COMMENT} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
609 LEXER_DEBUG ("{CONT}{S}*{NL}|{CONT}{S}*{COMMENT}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
610
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
611 if (yytext[0] == '\\')
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
612 curr_lexer->gripe_matlab_incompatible_continuation ();
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
613 curr_lexer->scan_for_comments (yytext);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
614 promptflag--;
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
615 curr_lexer->input_line_number++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
616 curr_lexer->current_input_column = 1;
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
617 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
618
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
619 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
620 // End of file.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
621 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
622
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
623 <<EOF>> {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
624 LEXER_DEBUG ("<<EOF>>");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
625
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
626 if (curr_lexer->block_comment_nesting_level != 0)
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
627 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
628 warning ("block comment open at end of input");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
629
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
630 if ((reading_fcn_file || reading_script_file || reading_classdef_file)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
631 && ! curr_fcn_file_name.empty ())
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
632 warning ("near line %d of file '%s.m'",
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
633 curr_lexer->input_line_number, curr_fcn_file_name.c_str ());
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
634 }
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
635
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
636 TOK_RETURN (END_OF_INPUT);
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
637 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
638
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
639 %{
970
9382316a8a01 [project @ 1994-12-12 06:03:34 by jwe]
jwe
parents: 969
diff changeset
640 // Identifiers. Truncate the token at the first space or tab but
9382316a8a01 [project @ 1994-12-12 06:03:34 by jwe]
jwe
parents: 969
diff changeset
641 // don't write directly on yytext.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
642 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
643
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
644 {IDENT}{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
645 LEXER_DEBUG ("{IDENT}{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
646
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
647 int id_tok = curr_lexer->handle_identifier ();
4238
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
648
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
649 if (id_tok >= 0)
9324
29563379fa9b don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents: 8974
diff changeset
650 COUNT_TOK_AND_RETURN (id_tok);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
651 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
652
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
653 %{
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
654 // Superclass method identifiers.
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
655 %}
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
656
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
657 {IDENT}@{IDENT}{S}* |
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
658 {IDENT}@{IDENT}.{IDENT}{S}* {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
659 LEXER_DEBUG ("{IDENT}@{IDENT}{S}*|{IDENT}@{IDENT}.{IDENT}{S}*");
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
660
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
661 int id_tok = curr_lexer->handle_superclass_identifier ();
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
662
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
663 if (id_tok >= 0)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
664 {
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
665 curr_lexer->looking_for_object_index = true;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
666
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
667 COUNT_TOK_AND_RETURN (id_tok);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
668 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
669 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
670
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
671 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
672 // Metaclass query
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
673 %}
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
674
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
675 \?{IDENT}{S}* |
14638
5b0872b5b234 fix missing backslash quoting in lexer rules
John W. Eaton <jwe@octave.org>
parents: 14510
diff changeset
676 \?{IDENT}\.{IDENT}{S}* {
5b0872b5b234 fix missing backslash quoting in lexer rules
John W. Eaton <jwe@octave.org>
parents: 14510
diff changeset
677 LEXER_DEBUG ("\\?{IDENT}{S}*|\\?{IDENT}\\.{IDENT}{S}*");
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
678
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
679 int id_tok = curr_lexer->handle_meta_identifier ();
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
680
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
681 if (id_tok >= 0)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
682 {
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
683 curr_lexer->looking_for_object_index = true;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
684
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
685 COUNT_TOK_AND_RETURN (id_tok);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
686 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
687 }
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
688
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
689 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
690 // Function handles and superclass references
4342
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
691 %}
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
692
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
693 "@" {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
694 LEXER_DEBUG ("@");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
695
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
696 curr_lexer->current_input_column++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
697
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
698 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
699 curr_lexer->convert_spaces_to_comma = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
700 curr_lexer->looking_at_function_handle++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
701 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
702 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
703
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
704 COUNT_TOK_AND_RETURN ('@');
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
705
4342
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
706 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
707
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
708 %{
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
709 // A new line character. New line characters inside matrix constants
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
710 // are handled by the <MATRIX_START> start state code above. If closest
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
711 // nesting is inside parentheses, don't return a row separator.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
712 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
713
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
714 {NL} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
715 LEXER_DEBUG ("{NL}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
716
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
717 curr_lexer->input_line_number++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
718 curr_lexer->current_input_column = 1;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
719
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
720 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
721 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
722
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
723 if (curr_lexer->nesting_level.none ())
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
724 {
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
725 curr_lexer->at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
726 COUNT_TOK_AND_RETURN ('\n');
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
727 }
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
728 else if (curr_lexer->nesting_level.is_paren ())
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
729 {
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
730 curr_lexer->at_beginning_of_statement = false;
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
731 curr_lexer->gripe_matlab_incompatible ("bare newline inside parentheses");
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
732 }
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
733 else if (curr_lexer->nesting_level.is_bracket_or_brace ())
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
734 return LEXICAL_ERROR;
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
735 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
736
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
737 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
738 // Single quote can either be the beginning of a string or a transpose
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
739 // operator.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
740 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
741
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
742 "'" {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
743 LEXER_DEBUG ("'");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
744
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
745 curr_lexer->current_input_column++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
746 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
747
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
748 if (curr_lexer->quote_is_transpose)
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
749 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
750 curr_lexer->do_comma_insert_check ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
751 COUNT_TOK_AND_RETURN (QUOTE);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
752 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
753 else
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
754 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
755 int tok = curr_lexer->handle_string ('\'');
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
756 COUNT_TOK_AND_RETURN (tok);
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
757 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
758 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
759
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
760 %{
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
761 // Double quotes always begin strings.
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
762 %}
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
763
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
764 \" {
14642
6edd02858516 lex.ll: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents: 14638
diff changeset
765 LEXER_DEBUG ("\"");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
766
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
767 curr_lexer->current_input_column++;
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
768 int tok = curr_lexer->handle_string ('"');
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
769
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
770 COUNT_TOK_AND_RETURN (tok);
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
771 }
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
772
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
773 %{
8536
de1b944d5306 lex.l: finish previous change
John W. Eaton <jwe@octave.org>
parents: 8535
diff changeset
774 // Gobble comments.
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
775 %}
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
776
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
777 {CCHAR} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
778 LEXER_DEBUG ("{CCHAR}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
779
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
780 curr_lexer->looking_for_object_index = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
781
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
782 curr_lexer->xunput (yytext[0]);
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
783
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
784 bool eof = false;
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
785 int tok = curr_lexer->process_comment (false, eof);
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
786
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
787 if (eof)
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
788 TOK_RETURN (END_OF_INPUT);
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
789 else if (tok > 0)
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
790 COUNT_TOK_AND_RETURN (tok);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
791 }
440
e27d10f2e573 [project @ 1994-05-30 03:33:37 by jwe]
jwe
parents: 430
diff changeset
792
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
793 %{
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
794 // Block comments.
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
795 %}
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
796
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
797 ^{S}*{CCHAR}\{{S}*{NL} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
798 LEXER_DEBUG ("^{S}*{CCHAR}\\{{S}*{NL}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
799
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
800 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
801
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
802 curr_lexer->input_line_number++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
803 curr_lexer->current_input_column = 1;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
804 curr_lexer->block_comment_nesting_level++;
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
805 promptflag--;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
806
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
807 bool eof = false;
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
808 curr_lexer->process_comment (true, eof);
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
809 }
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
810
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
811 %{
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
812 // Other operators.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
813 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
814
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
815 ":" { LEXER_DEBUG (":"); BIN_OP_RETURN (':', false, false); }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
816
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
817 ".+" { LEXER_DEBUG (".+"); XBIN_OP_RETURN (EPLUS, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
818 ".-" { LEXER_DEBUG (".-"); XBIN_OP_RETURN (EMINUS, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
819 ".*" { LEXER_DEBUG (".*"); BIN_OP_RETURN (EMUL, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
820 "./" { LEXER_DEBUG ("./"); BIN_OP_RETURN (EDIV, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
821 ".\\" { LEXER_DEBUG (".\\"); BIN_OP_RETURN (ELEFTDIV, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
822 ".^" { LEXER_DEBUG (".^"); BIN_OP_RETURN (EPOW, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
823 ".**" { LEXER_DEBUG (".**"); XBIN_OP_RETURN (EPOW, false, false); }
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
824 ".'" { LEXER_DEBUG (".'"); curr_lexer->do_comma_insert_check (); BIN_OP_RETURN (TRANSPOSE, true, false); }
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
825 "++" { LEXER_DEBUG ("++"); curr_lexer->do_comma_insert_check (); XBIN_OP_RETURN_INTERNAL (PLUS_PLUS, true, false, true); }
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
826 "--" { LEXER_DEBUG ("--"); curr_lexer->do_comma_insert_check (); XBIN_OP_RETURN_INTERNAL (MINUS_MINUS, true, false, true); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
827 "<=" { LEXER_DEBUG ("<="); BIN_OP_RETURN (EXPR_LE, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
828 "==" { LEXER_DEBUG ("=="); BIN_OP_RETURN (EXPR_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
829 "~=" { LEXER_DEBUG ("~="); BIN_OP_RETURN (EXPR_NE, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
830 "!=" { LEXER_DEBUG ("!="); XBIN_OP_RETURN (EXPR_NE, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
831 ">=" { LEXER_DEBUG (">="); BIN_OP_RETURN (EXPR_GE, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
832 "&" { LEXER_DEBUG ("&"); BIN_OP_RETURN (EXPR_AND, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
833 "|" { LEXER_DEBUG ("|"); BIN_OP_RETURN (EXPR_OR, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
834 "<" { LEXER_DEBUG ("<"); BIN_OP_RETURN (EXPR_LT, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
835 ">" { LEXER_DEBUG (">"); BIN_OP_RETURN (EXPR_GT, false, false); }
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
836 "+" { LEXER_DEBUG ("+"); BIN_OP_RETURN ('+', false, false); }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
837 "-" { LEXER_DEBUG ("-"); BIN_OP_RETURN ('-', false, false); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
838 "*" { LEXER_DEBUG ("*"); BIN_OP_RETURN ('*', false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
839 "/" { LEXER_DEBUG ("/"); BIN_OP_RETURN ('/', false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
840 "\\" { LEXER_DEBUG ("\\"); BIN_OP_RETURN (LEFTDIV, false, false); }
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
841 ";" { LEXER_DEBUG (";"); BIN_OP_RETURN (';', true, true); }
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
842 "," { LEXER_DEBUG (","); BIN_OP_RETURN (',', true, ! curr_lexer->looking_at_object_index.front ()); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
843 "^" { LEXER_DEBUG ("^"); BIN_OP_RETURN (POW, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
844 "**" { LEXER_DEBUG ("**"); XBIN_OP_RETURN (POW, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
845 "=" { LEXER_DEBUG ("="); BIN_OP_RETURN ('=', true, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
846 "&&" { LEXER_DEBUG ("&&"); BIN_OP_RETURN (EXPR_AND_AND, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
847 "||" { LEXER_DEBUG ("||"); BIN_OP_RETURN (EXPR_OR_OR, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
848 "<<" { LEXER_DEBUG ("<<"); XBIN_OP_RETURN (LSHIFT, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
849 ">>" { LEXER_DEBUG (">>"); XBIN_OP_RETURN (RSHIFT, false, false); }
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
850
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
851 {NOT} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
852 LEXER_DEBUG ("{NOT}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
853
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
854 if (yytext[0] == '~')
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
855 BIN_OP_RETURN (EXPR_NOT, false, false);
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
856 else
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
857 XBIN_OP_RETURN (EXPR_NOT, false, false);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
858 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
859
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
860 "(" {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
861 LEXER_DEBUG ("(");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
862
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
863 // If we are looking for an object index, then push TRUE for
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
864 // looking_at_object_index. Otherwise, just push whatever state
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
865 // is current (so that we can pop it off the stack when we find
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
866 // the matching close paren).
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
867
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
868 curr_lexer->looking_at_object_index.push_front
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
869 (curr_lexer->looking_for_object_index);
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
870
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
871 curr_lexer->looking_at_indirect_ref = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
872 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
873 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
874
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
875 curr_lexer->nesting_level.paren ();
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
876 promptflag--;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
877
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
878 TOK_RETURN ('(');
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
879 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
880
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
881 ")" {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
882 LEXER_DEBUG (")");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
883
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
884 curr_lexer->nesting_level.remove ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
885 curr_lexer->current_input_column++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
886
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
887 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
888
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
889 curr_lexer->quote_is_transpose = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
890 curr_lexer->convert_spaces_to_comma
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
891 = (curr_lexer->nesting_level.is_bracket_or_brace ()
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
892 && ! curr_lexer->looking_at_anon_fcn_args);
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
893 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
894 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
895
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
896 if (curr_lexer->looking_at_anon_fcn_args)
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
897 curr_lexer->looking_at_anon_fcn_args = false;
13237
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists.
John W. Eaton <jwe@octave.org>
parents: 12801
diff changeset
898
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
899 curr_lexer->do_comma_insert_check ();
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
900
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
901 COUNT_TOK_AND_RETURN (')');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
902 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
903
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
904 "." {
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
905 LEXER_DEBUG (".");
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
906
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
907 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
908 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
909
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
910 TOK_RETURN ('.');
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
911 }
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
912
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
913 "+=" { LEXER_DEBUG ("+="); XBIN_OP_RETURN (ADD_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
914 "-=" { LEXER_DEBUG ("-="); XBIN_OP_RETURN (SUB_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
915 "*=" { LEXER_DEBUG ("*="); XBIN_OP_RETURN (MUL_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
916 "/=" { LEXER_DEBUG ("/="); XBIN_OP_RETURN (DIV_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
917 "\\=" { LEXER_DEBUG ("\\="); XBIN_OP_RETURN (LEFTDIV_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
918 ".+=" { LEXER_DEBUG (".+="); XBIN_OP_RETURN (ADD_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
919 ".-=" { LEXER_DEBUG (".-="); XBIN_OP_RETURN (SUB_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
920 ".*=" { LEXER_DEBUG (".*="); XBIN_OP_RETURN (EMUL_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
921 "./=" { LEXER_DEBUG ("./="); XBIN_OP_RETURN (EDIV_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
922 ".\\=" { LEXER_DEBUG (".\\="); XBIN_OP_RETURN (ELEFTDIV_EQ, false, false); }
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
923 {POW}= { LEXER_DEBUG ("{POW}="); XBIN_OP_RETURN (POW_EQ, false, false); }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
924 {EPOW}= { LEXER_DEBUG ("{EPOW}="); XBIN_OP_RETURN (EPOW_EQ, false, false); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
925 "&=" { LEXER_DEBUG ("&="); XBIN_OP_RETURN (AND_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
926 "|=" { LEXER_DEBUG ("|="); XBIN_OP_RETURN (OR_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
927 "<<=" { LEXER_DEBUG ("<<="); XBIN_OP_RETURN (LSHIFT_EQ, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
928 ">>=" { LEXER_DEBUG (">>="); XBIN_OP_RETURN (RSHIFT_EQ, false, false); }
2877
5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe]
jwe
parents: 2861
diff changeset
929
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
930 \{{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
931 LEXER_DEBUG ("\\{{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
932
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
933 curr_lexer->nesting_level.brace ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
934
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
935 curr_lexer->looking_at_object_index.push_front
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
936 (curr_lexer->looking_for_object_index);
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
937
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
938 curr_lexer->current_input_column += yyleng;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
939 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
940 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
941 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
942 curr_lexer->at_beginning_of_statement = false;
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
943
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
944 promptflag--;
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
945 curr_lexer->eat_whitespace ();
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
946
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
947 curr_lexer->braceflag++;
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
948 BEGIN (MATRIX_START);
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
949 COUNT_TOK_AND_RETURN ('{');
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
950 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
951
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
952 "}" {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
953 LEXER_DEBUG ("}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
954
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
955 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
956
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
957 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
958 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
959
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
960 curr_lexer->nesting_level.remove ();
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
961
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
962 TOK_RETURN ('}');
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
963 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
964
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
965 %{
2066
a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe]
jwe
parents: 2042
diff changeset
966 // Unrecognized input is a lexical error.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
967 %}
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
968
2042
31f4f775b8c6 [project @ 1996-03-28 09:06:28 by jwe]
jwe
parents: 1994
diff changeset
969 . {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
970 LEXER_DEBUG (".");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
971
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
972 curr_lexer->xunput (yytext[0]);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
973
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
974 int c = curr_lexer->text_yyinput ();
4248
eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe]
jwe
parents: 4241
diff changeset
975
eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe]
jwe
parents: 4241
diff changeset
976 if (c != EOF)
4240
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
977 {
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
978 curr_lexer->current_input_column++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
979
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
980 error ("invalid character '%s' (ASCII %d) near line %d, column %d",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
981 undo_string_escape (static_cast<char> (c)), c,
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
982 curr_lexer->input_line_number, curr_lexer->current_input_column);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
983
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
984 return LEXICAL_ERROR;
4240
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
985 }
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
986 else
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
987 TOK_RETURN (END_OF_INPUT);
2066
a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe]
jwe
parents: 2042
diff changeset
988 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
989
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
990 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
991
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
992 static void
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
993 display_character (char c)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
994 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
995 if (isgraph (c))
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
996 std::cerr << c;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
997 else
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
998 switch (c)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
999 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1000 case 0:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1001 std::cerr << "NUL";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1002 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1003
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1004 case 1:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1005 std::cerr << "SOH";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1006 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1007
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1008 case 2:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1009 std::cerr << "STX";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1010 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1011
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1012 case 3:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1013 std::cerr << "ETX";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1014 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1015
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1016 case 4:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1017 std::cerr << "EOT";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1018 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1019
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1020 case 5:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1021 std::cerr << "ENQ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1022 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1023
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1024 case 6:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1025 std::cerr << "ACK";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1026 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1027
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1028 case 7:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1029 std::cerr << "\\a";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1030 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1031
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1032 case 8:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1033 std::cerr << "\\b";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1034 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1035
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1036 case 9:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1037 std::cerr << "\\t";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1038 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1039
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1040 case 10:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1041 std::cerr << "\\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1042 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1043
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1044 case 11:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1045 std::cerr << "\\v";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1046 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1047
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1048 case 12:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1049 std::cerr << "\\f";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1050 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1051
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1052 case 13:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1053 std::cerr << "\\r";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1054 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1055
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1056 case 14:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1057 std::cerr << "SO";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1058 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1059
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1060 case 15:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1061 std::cerr << "SI";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1062 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1063
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1064 case 16:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1065 std::cerr << "DLE";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1066 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1067
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1068 case 17:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1069 std::cerr << "DC1";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1070 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1071
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1072 case 18:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1073 std::cerr << "DC2";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1074 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1075
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1076 case 19:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1077 std::cerr << "DC3";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1078 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1079
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1080 case 20:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1081 std::cerr << "DC4";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1082 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1083
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1084 case 21:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1085 std::cerr << "NAK";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1086 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1087
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1088 case 22:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1089 std::cerr << "SYN";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1090 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1091
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1092 case 23:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1093 std::cerr << "ETB";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1094 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1095
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1096 case 24:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1097 std::cerr << "CAN";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1098 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1099
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1100 case 25:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1101 std::cerr << "EM";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1102 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1103
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1104 case 26:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1105 std::cerr << "SUB";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1106 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1107
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1108 case 27:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1109 std::cerr << "ESC";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1110 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1111
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1112 case 28:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1113 std::cerr << "FS";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1114 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1115
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1116 case 29:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1117 std::cerr << "GS";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1118 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1119
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1120 case 30:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1121 std::cerr << "RS";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1122 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1123
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1124 case 31:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1125 std::cerr << "US";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1126 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1127
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1128 case 32:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1129 std::cerr << "SPACE";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1130 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1131
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1132 case 127:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1133 std::cerr << "DEL";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1134 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1135 }
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1136 }
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1137
13973
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1138 void
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1139 cleanup_parser (void)
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1140 {
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1141 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1142
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1143 // Return 1 if the given character matches any character in the given
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1144 // string.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1145
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1146 static bool
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1147 match_any (char c, const char *s)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1148 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1149 char tmp;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1150 while ((tmp = *s++) != '\0')
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1151 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1152 if (c == tmp)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1153 return true;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1154 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1155 return false;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1156 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1157
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1158 // Given information about the spacing surrounding an operator,
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1159 // return 1 if it looks like it should be treated as a binary
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1160 // operator. For example,
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1161 //
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1162 // [ 1 + 2 ] or [ 1+ 2] or [ 1+2 ] ==> binary
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1163 //
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1164 // [ 1 +2 ] ==> unary
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1165
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1166 static bool
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1167 looks_like_bin_op (bool spc_prev, int next_char)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1168 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1169 bool spc_next = (next_char == ' ' || next_char == '\t');
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1170
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1171 return ((spc_prev && spc_next) || ! spc_prev);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1172 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1173
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1174 bool
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1175 is_keyword (const std::string& s)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1176 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1177 // Parsing function names like "set.property_name" inside
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1178 // classdef-style class definitions is simplified by handling the
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1179 // "set" and "get" portions of the names using the same mechanism as
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1180 // is used for keywords. However, they are not really keywords in
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1181 // the language, so omit them from the list of possible keywords.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1182
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1183 return (octave_kw_hash::in_word_set (s.c_str (), s.length ()) != 0
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1184 && ! (s == "set" || s == "get"));
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1185 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1186
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1187 DEFUN (iskeyword, args, ,
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1188 "-*- texinfo -*-\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1189 @deftypefn {Built-in Function} {} iskeyword ()\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1190 @deftypefnx {Built-in Function} {} iskeyword (@var{name})\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1191 Return true if @var{name} is an Octave keyword. If @var{name}\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1192 is omitted, return a list of keywords.\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1193 @seealso{isvarname, exist}\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1194 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1195 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1196 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1197
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1198 int argc = args.length () + 1;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1199
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1200 string_vector argv = args.make_argv ("iskeyword");
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1201
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1202 if (error_state)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1203 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1204
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1205 if (argc == 1)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1206 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1207 // Neither set and get are keywords. See the note in the
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1208 // is_keyword function for additional details.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1209
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1210 string_vector lst (TOTAL_KEYWORDS);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1211
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1212 int j = 0;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1213
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1214 for (int i = 0; i < TOTAL_KEYWORDS; i++)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1215 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1216 std::string tmp = wordlist[i].name;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1217
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1218 if (! (tmp == "set" || tmp == "get"))
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1219 lst[j++] = tmp;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1220 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1221
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1222 lst.resize (j);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1223
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1224 retval = Cell (lst.sort ());
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1225 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1226 else if (argc == 2)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1227 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1228 retval = is_keyword (argv[1]);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1229 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1230 else
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1231 print_usage ();
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1232
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1233 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1234 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1235
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1236 /*
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1237
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1238 %!assert (iskeyword ("for"))
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1239 %!assert (iskeyword ("fort"), false)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1240 %!assert (iskeyword ("fft"), false)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1241
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1242 */
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1243
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1244 // Used to delete trailing white space from tokens.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1245
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1246 static std::string
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1247 strip_trailing_whitespace (char *s)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1248 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1249 std::string retval = s;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1250
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1251 size_t pos = retval.find_first_of (" \t");
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1252
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1253 if (pos != std::string::npos)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1254 retval.resize (pos);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1255
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1256 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1257 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1258
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1259 DEFUN (__display_tokens__, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1260 "-*- texinfo -*-\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1261 @deftypefn {Built-in Function} {} __display_tokens__ ()\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1262 Query or set the internal variable that determines whether Octave's\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1263 lexer displays tokens as they are read.\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1264 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1265 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1266 return SET_INTERNAL_VARIABLE (display_tokens);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1267 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1268
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1269 DEFUN (__token_count__, , ,
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1270 "-*- texinfo -*-\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1271 @deftypefn {Built-in Function} {} __token_count__ ()\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1272 Number of language tokens processed since Octave startup.\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1273 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1274 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1275 return octave_value (Vtoken_count);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1276 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1277
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1278 DEFUN (__lexer_debug_flag__, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1279 "-*- texinfo -*-\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1280 @deftypefn {Built-in Function} {@var{old_val} =} __lexer_debug_flag__ (@var{new_val}))\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1281 Undocumented internal function.\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1282 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1283 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1284 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1285
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1286 retval = set_internal_variable (lexer_debug_flag, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1287 "__lexer_debug_flag__");
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1288
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1289 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1290 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1291
16117
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1292 class
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1293 flex_stream_reader : public stream_reader
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1294 {
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1295 public:
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1296 flex_stream_reader (lexical_feedback *l, char *buf_arg)
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1297 : stream_reader (), lexer (l), buf (buf_arg)
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1298 { }
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1299
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1300 int getc (void) { return lexer->text_yyinput (); }
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1301 int ungetc (int c) { lexer->xunput (c, buf); return 0; }
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1302
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1303 private:
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1304
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1305 // No copying!
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1306
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1307 flex_stream_reader (const flex_stream_reader&);
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1308
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1309 flex_stream_reader& operator = (const flex_stream_reader&);
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1310
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1311 lexical_feedback *lexer;
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1312
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1313 char *buf;
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1314 };
771186909285 maint: move class definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16116
diff changeset
1315
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1316 lexical_feedback::~lexical_feedback (void)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1317 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1318 // Clear out the stack of token info used to track line and
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1319 // column numbers.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1320
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1321 while (! token_stack.empty ())
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1322 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1323 delete token_stack.top ();
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1324 token_stack.pop ();
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1325 }
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1326
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1327 yylex_destroy (scanner);
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1328 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1329
16123
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1330 void
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1331 lexical_feedback::init (void)
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1332 {
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1333 // The closest paren, brace, or bracket nesting is not an object
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1334 // index.
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1335 looking_at_object_index.push_front (false);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1336
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1337 yylex_init (&scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1338
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1339 // Make lexical_feedback object available through yyextra in
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1340 // flex-generated lexer.
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1341 yyset_extra (this, scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1342 }
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1343
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1344 // Inside Flex-generated functions, yyg is the scanner cast to its real
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1345 // type. The BEGIN macro uses yyg and we want to use that in
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1346 // lexical_feedback member functions. If we could set the start state
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1347 // by calling a function instead of using the BEGIN macro, we could
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1348 // eliminate the OCTAVE_YYG macro.
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1349
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1350 #define OCTAVE_YYG \
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1351 struct yyguts_t *yyg = static_cast<struct yyguts_t*> (scanner)
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1352
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1353 void
16139
2fd39ab12209 move a function and data member from lexical_feedback to octave_parser
John W. Eaton <jwe@octave.org>
parents: 16130
diff changeset
1354 lexical_feedback::reset (void)
16123
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1355 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1356 OCTAVE_YYG;
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1357
16123
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1358 // Start off on the right foot.
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1359 BEGIN (INITIAL);
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1360
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1361 parser_symtab_context.clear ();
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1362
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1363 // We do want a prompt by default.
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1364 promptflag = 1;
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1365
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1366 // Only ask for input from stdin if we are expecting interactive
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1367 // input.
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1368
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1369 if (! quitting_gracefully
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1370 && (interactive || forced_interactive)
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1371 && ! (reading_fcn_file
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1372 || reading_classdef_file
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1373 || reading_script_file
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1374 || get_input_from_eval_string
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1375 || input_from_startup_file))
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1376 yyrestart (stdin, scanner);
16123
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1377
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1378 // Clear the buffer for help text.
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1379 while (! help_buf.empty ())
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1380 help_buf.pop ();
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1381 }
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1382
16124
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1383 void
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1384 lexical_feedback::prep_for_script_file (void)
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1385 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1386 OCTAVE_YYG;
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1387
16124
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1388 BEGIN (SCRIPT_FILE_BEGIN);
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1389 }
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1390
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1391 void
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1392 lexical_feedback::prep_for_function_file (void)
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1393 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1394 OCTAVE_YYG;
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1395
16124
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1396 BEGIN (FUNCTION_FILE_BEGIN);
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1397 }
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1398
16155
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
1399 void
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
1400 lexical_feedback::prep_for_classdef_file (void)
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
1401 {
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
1402 OCTAVE_YYG;
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
1403
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
1404 BEGIN (CLASSDEF_FILE_BEGIN);
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
1405 }
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
1406
16121
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1407 int
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1408 lexical_feedback::octave_read (char *buf, unsigned max_size)
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1409 {
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1410 static const char * const eol = "\n";
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1411 static std::string input_buf;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1412 static const char *pos = 0;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1413 static size_t chars_left = 0;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1414 static bool eof = false;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1415
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1416 int status = 0;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1417
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1418 if (chars_left == 0)
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1419 {
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1420 pos = 0;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1421
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1422 input_buf = get_user_input (eof);
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1423
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1424 chars_left = input_buf.length ();
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1425
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1426 pos = input_buf.c_str ();
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1427 }
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1428
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1429 if (chars_left > 0)
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1430 {
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1431 size_t len = max_size > chars_left ? chars_left : max_size;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1432 assert (len > 0);
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1433
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1434 memcpy (buf, pos, len);
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1435
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1436 chars_left -= len;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1437 pos += len;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1438
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1439 // Make sure input ends with a new line character.
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1440 if (chars_left == 0 && buf[len-1] != '\n')
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1441 {
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1442 if (len < max_size)
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1443 {
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1444 // There is enough room to plug the newline character in
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1445 // the buffer.
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1446 buf[len++] = '\n';
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1447 }
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1448 else
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1449 {
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1450 // There isn't enough room to plug the newline character
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1451 // in the buffer so make sure it is returned on the next
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1452 // octave_read call.
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1453 pos = eol;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1454 chars_left = 1;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1455 }
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1456 }
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1457
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1458 status = len;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1459 }
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1460 else
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1461 {
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1462 status = YY_NULL;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1463
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1464 if (! eof)
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1465 fatal_error ("octave_read () in flex scanner failed");
16121
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1466 }
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1467
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1468 return status;
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1469 }
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1470
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1471 char *
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1472 lexical_feedback::flex_yytext (void)
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1473 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1474 return yyget_text (scanner);
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1475 }
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1476
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
1477 int
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
1478 lexical_feedback::flex_yyleng (void)
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
1479 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1480 return yyget_leng (scanner);
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
1481 }
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
1482
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1483 // GAG.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1484 //
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1485 // If we're reading a matrix and the next character is '[', make sure
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1486 // that we insert a comma ahead of it.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1487
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1488 void
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1489 lexical_feedback::do_comma_insert_check (void)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1490 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1491 bool spc_gobbled = (eat_continuation () != lexical_feedback::NO_WHITESPACE);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1492
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1493 int c = text_yyinput ();
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1494
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1495 xunput (c);
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1496
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1497 if (spc_gobbled)
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1498 xunput (' ');
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1499
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1500 do_comma_insert = (! looking_at_object_index.front ()
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1501 && bracketflag && c == '[');
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1502 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1503
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1504 int
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1505 lexical_feedback::text_yyinput (void)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1506 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1507 int c = yyinput (scanner);
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1508
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1509 if (lexer_debug_flag)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1510 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1511 std::cerr << "I: ";
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1512 display_character (c);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1513 std::cerr << std::endl;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1514 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1515
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1516 // Convert CRLF into just LF and single CR into LF.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1517
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1518 if (c == '\r')
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1519 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1520 c = yyinput (scanner);
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1521
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1522 if (lexer_debug_flag)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1523 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1524 std::cerr << "I: ";
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1525 display_character (c);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1526 std::cerr << std::endl;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1527 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1528
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1529 if (c != '\n')
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1530 {
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1531 xunput (c);
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1532 c = '\n';
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1533 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1534 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1535
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1536 if (c == '\n')
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1537 input_line_number++;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1538
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1539 return c;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1540 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1541
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1542 void
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1543 lexical_feedback::xunput (char c, char *buf)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1544 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1545 if (lexer_debug_flag)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1546 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1547 std::cerr << "U: ";
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1548 display_character (c);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1549 std::cerr << std::endl;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1550 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1551
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1552 if (c == '\n')
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1553 input_line_number--;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1554
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1555 yyunput (c, buf, scanner);
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1556 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1557
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1558 void
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1559 lexical_feedback::xunput (char c)
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1560 {
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1561 char *yytxt = flex_yytext ();
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1562
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1563 xunput (c, yytxt);
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1564 }
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1565
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1566 // If we read some newlines, we need figure out what column we're
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1567 // really looking at.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1568
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1569 void
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1570 lexical_feedback::fixup_column_count (char *s)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1571 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1572 char c;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1573 while ((c = *s++) != '\0')
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1574 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1575 if (c == '\n')
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1576 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1577 input_line_number++;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1578 current_input_column = 1;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1579 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1580 else
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1581 current_input_column++;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1582 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1583 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1584
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1585 bool
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1586 lexical_feedback::inside_any_object_index (void)
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1587 {
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1588 bool retval = false;
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1589
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1590 for (std::list<bool>::const_iterator i = looking_at_object_index.begin ();
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1591 i != looking_at_object_index.end (); i++)
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1592 {
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1593 if (*i)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1594 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1595 retval = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1596 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1597 }
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1598 }
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1599
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1600 return retval;
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1601 }
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1602
4238
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
1603 // Handle keywords. Return -1 if the keyword should be ignored.
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1604
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1605 int
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1606 lexical_feedback::is_keyword_token (const std::string& s)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1607 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1608 int l = input_line_number;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1609 int c = current_input_column;
3805
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe]
jwe
parents: 3802
diff changeset
1610
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
1611 int len = s.length ();
922
708827b941b4 [project @ 1994-11-14 22:14:13 by jwe]
jwe
parents: 916
diff changeset
1612
5088
7830f271a53f [project @ 2004-12-01 19:54:45 by jwe]
jwe
parents: 5035
diff changeset
1613 const octave_kw *kw = octave_kw_hash::in_word_set (s.c_str (), len);
191
b6b4d8c513fe [project @ 1993-10-29 23:41:39 by jwe]
jwe
parents: 186
diff changeset
1614
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1615 if (kw)
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 120
diff changeset
1616 {
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1617 token *tok_val = 0;
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1618
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1619 switch (kw->kw_id)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1620 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1621 case break_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1622 case catch_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1623 case continue_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1624 case else_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1625 case otherwise_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1626 case return_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1627 case unwind_protect_cleanup_kw:
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1628 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1629 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1630
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1631 case static_kw:
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1632 if ((reading_fcn_file || reading_script_file
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1633 || reading_classdef_file)
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1634 && ! curr_fcn_file_full_name.empty ())
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1635 warning_with_id ("Octave:deprecated-keyword",
15468
6437fa7263dd use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 15467
diff changeset
1636 "the 'static' keyword is obsolete and will be removed from a future version of Octave; please use 'persistent' instead; near line %d of file '%s'",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1637 input_line_number,
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1638 curr_fcn_file_full_name.c_str ());
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1639 else
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1640 warning_with_id ("Octave:deprecated-keyword",
15468
6437fa7263dd use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 15467
diff changeset
1641 "the 'static' keyword is obsolete and will be removed from a future version of Octave; please use 'persistent' instead; near line %d",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1642 input_line_number);
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1643 // fall through ...
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1644
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1645 case persistent_kw:
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1646 break;
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1647
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1648 case case_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1649 case elseif_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1650 case global_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1651 case until_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1652 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1653
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1654 case end_kw:
14645
cbc00b587f36 also allow "end" indexing in classdef files
John W. Eaton <jwe@octave.org>
parents: 14642
diff changeset
1655 if (inside_any_object_index ()
cbc00b587f36 also allow "end" indexing in classdef files
John W. Eaton <jwe@octave.org>
parents: 14642
diff changeset
1656 || (! reading_classdef_file
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1657 && (defining_func
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1658 && ! (looking_at_return_list
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1659 || parsed_function_name.top ()))))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1660 return 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1661
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1662 tok_val = new token (token::simple_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1663 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1664 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1665
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1666 case end_try_catch_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1667 tok_val = new token (token::try_catch_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1668 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1669 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1670
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1671 case end_unwind_protect_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1672 tok_val = new token (token::unwind_protect_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1673 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1674 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1675
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1676 case endfor_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1677 tok_val = new token (token::for_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1678 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1679 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1680
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1681 case endfunction_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1682 tok_val = new token (token::function_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1683 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1684 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1685
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1686 case endif_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1687 tok_val = new token (token::if_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1688 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1689 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1690
13246
0c69a564f2be additional parfor changes
John W. Eaton <jwe@octave.org>
parents: 13245
diff changeset
1691 case endparfor_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1692 tok_val = new token (token::parfor_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1693 at_beginning_of_statement = true;
13246
0c69a564f2be additional parfor changes
John W. Eaton <jwe@octave.org>
parents: 13245
diff changeset
1694 break;
0c69a564f2be additional parfor changes
John W. Eaton <jwe@octave.org>
parents: 13245
diff changeset
1695
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1696 case endswitch_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1697 tok_val = new token (token::switch_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1698 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1699 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1700
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1701 case endwhile_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1702 tok_val = new token (token::while_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1703 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1704 break;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1705
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1706 case endclassdef_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1707 tok_val = new token (token::classdef_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1708 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1709 break;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1710
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1711 case endenumeration_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1712 tok_val = new token (token::enumeration_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1713 at_beginning_of_statement = true;
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1714 break;
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1715
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1716 case endevents_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1717 tok_val = new token (token::events_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1718 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1719 break;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1720
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1721 case endmethods_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1722 tok_val = new token (token::methods_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1723 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1724 break;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1725
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1726 case endproperties_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1727 tok_val = new token (token::properties_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1728 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1729 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1730
13245
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now
John W. Eaton <jwe@octave.org>
parents: 13237
diff changeset
1731
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1732 case for_kw:
13245
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now
John W. Eaton <jwe@octave.org>
parents: 13237
diff changeset
1733 case parfor_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1734 case while_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1735 promptflag--;
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1736 looping++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1737 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1738
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1739 case do_kw:
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1740 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1741 promptflag--;
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1742 looping++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1743 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1744
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1745 case try_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1746 case unwind_protect_kw:
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1747 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1748 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1749 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1750
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1751 case if_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1752 case switch_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1753 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1754 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1755
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1756 case get_kw:
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1757 case set_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1758 // 'get' and 'set' are keywords in classdef method
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1759 // declarations.
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1760 if (! maybe_classdef_get_set_method)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1761 return 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1762 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1763
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1764 case enumeration_kw:
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1765 case events_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1766 case methods_kw:
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1767 case properties_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1768 // 'properties', 'methods' and 'events' are keywords for
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1769 // classdef blocks.
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1770 if (! parsing_classdef)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1771 return 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1772 // fall through ...
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1773
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1774 case classdef_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1775 // 'classdef' is always a keyword.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1776 promptflag--;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1777 break;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1778
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1779 case function_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1780 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1781
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1782 defining_func++;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1783 parsed_function_name.push (false);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1784
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1785 if (! (reading_fcn_file || reading_script_file
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1786 || reading_classdef_file))
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1787 input_line_number = 1;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1788 break;
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1789
3174
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe]
jwe
parents: 3165
diff changeset
1790 case magic_file_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1791 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1792 if ((reading_fcn_file || reading_script_file
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1793 || reading_classdef_file)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1794 && ! curr_fcn_file_full_name.empty ())
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1795 tok_val = new token (curr_fcn_file_full_name, l, c);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1796 else
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1797 tok_val = new token ("stdin", l, c);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1798 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1799 break;
3174
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe]
jwe
parents: 3165
diff changeset
1800
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe]
jwe
parents: 3165
diff changeset
1801 case magic_line_kw:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1802 tok_val = new token (static_cast<double> (l), "", l, c);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1803 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1804
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1805 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1806 panic_impossible ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1807 }
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1808
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1809 if (! tok_val)
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1810 tok_val = new token (l, c);
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1811
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
1812 push_token (tok_val);
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1813
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1814 return kw->tok;
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 120
diff changeset
1815 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1816
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1817 return 0;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1818 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1819
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1820 bool
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1821 lexical_feedback::is_variable (const std::string& name)
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
1822 {
8001
ff9e7873f8ea improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents: 7898
diff changeset
1823 return (symbol_table::is_variable (name)
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1824 || (pending_local_variables.find (name)
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1825 != pending_local_variables.end ()));
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
1826 }
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
1827
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1828 std::string
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1829 lexical_feedback::grab_block_comment (stream_reader& reader, bool& eof)
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1830 {
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1831 std::string buf;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1832
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1833 bool at_bol = true;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1834 bool look_for_marker = false;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1835
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1836 bool warned_incompatible = false;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1837
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1838 int c = 0;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1839
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1840 while ((c = reader.getc ()) != EOF)
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1841 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1842 current_input_column++;
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1843
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1844 if (look_for_marker)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1845 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1846 at_bol = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1847 look_for_marker = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1848
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1849 if (c == '{' || c == '}')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1850 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1851 std::string tmp_buf (1, static_cast<char> (c));
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1852
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1853 int type = c;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1854
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1855 bool done = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1856
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1857 while ((c = reader.getc ()) != EOF && ! done)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1858 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1859 current_input_column++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1860
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1861 switch (c)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1862 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1863 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1864 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1865 tmp_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1866 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1867
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1868 case '\n':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1869 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1870 current_input_column = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1871 at_bol = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1872 done = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1873
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1874 if (type == '{')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1875 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1876 block_comment_nesting_level++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1877 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1878 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1879 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1880 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1881 block_comment_nesting_level--;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1882 promptflag++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1883
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1884 if (block_comment_nesting_level == 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1885 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1886 buf += grab_comment_block (reader, true, eof);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1887
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1888 return buf;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1889 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1890 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1891 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1892 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1893
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1894 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1895 at_bol = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1896 tmp_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1897 buf += tmp_buf;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1898 done = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1899 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1900 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1901 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1902 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1903 }
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1904
7898
cce16b4e0970 lex.l (grab_block_comment): Use parens around || expression within && expression
John W. Eaton <jwe@octave.org>
parents: 7728
diff changeset
1905 if (at_bol && (c == '%' || c == '#'))
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1906 {
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1907 if (c == '#' && ! warned_incompatible)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1908 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1909 warned_incompatible = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1910 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1911 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1912
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1913 at_bol = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1914 look_for_marker = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1915 }
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1916 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1917 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1918 buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1919
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1920 if (c == '\n')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1921 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1922 current_input_column = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1923 at_bol = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1924 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1925 }
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1926 }
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1927
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1928 if (c == EOF)
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1929 eof = true;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1930
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1931 return buf;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1932 }
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1933
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1934 std::string
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1935 lexical_feedback::grab_comment_block (stream_reader& reader, bool at_bol,
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1936 bool& eof)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1937 {
4426
51a0dcde8778 [project @ 2003-06-13 19:16:37 by jwe]
jwe
parents: 4410
diff changeset
1938 std::string buf;
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
1939
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1940 // TRUE means we are at the beginning of a comment block.
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1941 bool begin_comment = false;
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1942
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1943 // TRUE means we are currently reading a comment block.
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1944 bool in_comment = false;
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1945
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1946 bool warned_incompatible = false;
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
1947
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
1948 int c = 0;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1949
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1950 while ((c = reader.getc ()) != EOF)
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
1951 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1952 current_input_column++;
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1953
2300
9484969866d2 [project @ 1996-06-24 07:13:26 by jwe]
jwe
parents: 2200
diff changeset
1954 if (begin_comment)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1955 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1956 if (c == '%' || c == '#')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1957 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1958 at_bol = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1959 continue;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1960 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1961 else if (at_bol && c == '{')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1962 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1963 std::string tmp_buf (1, static_cast<char> (c));
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1964
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1965 bool done = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1966
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1967 while ((c = reader.getc ()) != EOF && ! done)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1968 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1969 current_input_column++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1970
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1971 switch (c)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1972 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1973 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1974 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1975 tmp_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1976 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1977
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1978 case '\n':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1979 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1980 current_input_column = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1981 at_bol = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1982 done = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1983
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1984 block_comment_nesting_level++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1985 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1986
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1987 buf += grab_block_comment (reader, eof);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1988
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1989 in_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1990
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1991 if (eof)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1992 goto done;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1993 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1994 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1995
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1996 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1997 at_bol = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1998 tmp_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1999 buf += tmp_buf;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2000 done = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2001 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2002 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2003 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2004 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2005 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2006 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2007 at_bol = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2008 begin_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2009 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2010 }
2300
9484969866d2 [project @ 1996-06-24 07:13:26 by jwe]
jwe
parents: 2200
diff changeset
2011
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
2012 if (in_comment)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2013 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2014 buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2015
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2016 if (c == '\n')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2017 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2018 at_bol = true;
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2019 current_input_column = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2020 in_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2021
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2022 // FIXME -- bailing out here prevents things like
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2023 //
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2024 // octave> # comment
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2025 // octave> x = 1
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2026 //
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2027 // from failing at the command line, while still
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2028 // allowing blocks of comments to be grabbed properly
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2029 // for function doc strings. But only the first line of
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2030 // a mult-line doc string will be picked up for
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2031 // functions defined on the command line. We need a
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2032 // better way of collecting these comments...
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2033 if (! (reading_fcn_file || reading_script_file))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2034 goto done;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2035 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2036 }
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
2037 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2038 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2039 switch (c)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2040 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2041 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2042 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2043 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2044
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2045 case '#':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2046 if (! warned_incompatible)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2047 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2048 warned_incompatible = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2049 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2050 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2051 // fall through...
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2052
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2053 case '%':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2054 in_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2055 begin_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2056 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2057
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2058 default:
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2059 current_input_column--;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2060 reader.ungetc (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2061 goto done;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2062 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2063 }
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
2064 }
991
18be848f10a9 [project @ 1994-12-15 06:06:46 by jwe]
jwe
parents: 985
diff changeset
2065
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
2066 done:
991
18be848f10a9 [project @ 1994-12-15 06:06:46 by jwe]
jwe
parents: 985
diff changeset
2067
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2068 if (c == EOF)
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2069 eof = true;
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2070
4426
51a0dcde8778 [project @ 2003-06-13 19:16:37 by jwe]
jwe
parents: 4410
diff changeset
2071 return buf;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2072 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2073
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2074 int
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2075 lexical_feedback::process_comment (bool start_in_block, bool& eof)
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2076 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
2077 OCTAVE_YYG;
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
2078
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2079 eof = false;
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2080
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2081 std::string help_txt;
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2082
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2083 if (! help_buf.empty ())
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2084 help_txt = help_buf.top ();
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2085
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2086 char *yytxt = flex_yytext ();
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2087 flex_stream_reader flex_reader (this, yytxt);
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
2088
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2089 // process_comment is only supposed to be called when we are not
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2090 // initially looking at a block comment.
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2091
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2092 std::string txt = start_in_block
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2093 ? grab_block_comment (flex_reader, eof)
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2094 : grab_comment_block (flex_reader, false, eof);
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
2095
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2096 if (lexer_debug_flag)
8536
de1b944d5306 lex.l: finish previous change
John W. Eaton <jwe@octave.org>
parents: 8535
diff changeset
2097 std::cerr << "C: " << txt << std::endl;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2098
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2099 if (help_txt.empty () && nesting_level.none ())
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2100 {
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2101 if (! help_buf.empty ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2102 help_buf.pop ();
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2103
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2104 help_buf.push (txt);
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2105 }
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
2106
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
2107 octave_comment_buffer::append (txt);
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2108
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2109 current_input_column = 1;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2110 quote_is_transpose = false;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2111 convert_spaces_to_comma = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2112 at_beginning_of_statement = true;
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2113
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2114 if (YY_START == COMMAND_START)
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2115 BEGIN (INITIAL);
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2116
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2117 if (nesting_level.none ())
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2118 return '\n';
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2119 else if (nesting_level.is_bracket_or_brace ())
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2120 return ';';
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2121 else
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2122 return 0;
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2123 }
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2124
3263
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2125 // Recognize separators. If the separator is a CRLF pair, it is
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2126 // replaced by a single LF.
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2127
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2128 bool
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2129 lexical_feedback::next_token_is_sep_op (void)
3263
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2130 {
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2131 bool retval = false;
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2132
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2133 int c = text_yyinput ();
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2134
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2135 retval = match_any (c, ",;\n]");
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2136
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2137 xunput (c);
3263
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2138
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2139 return retval;
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2140 }
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2141
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2142 // Try to determine if the next token should be treated as a postfix
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2143 // unary operator. This is ugly, but it seems to do the right thing.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2144
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2145 bool
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2146 lexical_feedback::next_token_is_postfix_unary_op (bool spc_prev)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2147 {
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2148 bool un_op = false;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2149
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2150 int c0 = text_yyinput ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2151
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2152 if (c0 == '\'' && ! spc_prev)
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2153 {
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2154 un_op = true;
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2155 }
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2156 else if (c0 == '.')
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2157 {
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2158 int c1 = text_yyinput ();
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2159 un_op = (c1 == '\'');
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2160 xunput (c1);
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2161 }
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2162 else if (c0 == '+')
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2163 {
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2164 int c1 = text_yyinput ();
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2165 un_op = (c1 == '+');
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2166 xunput (c1);
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2167 }
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2168 else if (c0 == '-')
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2169 {
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2170 int c1 = text_yyinput ();
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2171 un_op = (c1 == '-');
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2172 xunput (c1);
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2173 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2174
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2175 xunput (c0);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2176
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2177 return un_op;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2178 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2179
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2180 // Try to determine if the next token should be treated as a binary
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2181 // operator.
1521
b3e4ca4f75a0 [project @ 1995-10-04 05:10:36 by jwe]
jwe
parents: 1520
diff changeset
2182 //
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2183 // This kluge exists because whitespace is not always ignored inside
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2184 // the square brackets that are used to create matrix objects (though
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2185 // spacing only really matters in the cases that can be interpreted
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2186 // either as binary ops or prefix unary ops: currently just +, -).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2187 //
3779
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe]
jwe
parents: 3774
diff changeset
2188 // Note that a line continuation directly following a + or - operator
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe]
jwe
parents: 3774
diff changeset
2189 // (e.g., the characters '[' 'a' ' ' '+' '\' LFD 'b' ']') will be
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe]
jwe
parents: 3774
diff changeset
2190 // parsed as a binary operator.
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2191
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2192 bool
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2193 lexical_feedback::next_token_is_bin_op (bool spc_prev)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2194 {
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2195 bool bin_op = false;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2196
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2197 int c0 = text_yyinput ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2198
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2199 switch (c0)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2200 {
777
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe]
jwe
parents: 767
diff changeset
2201 case '+':
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe]
jwe
parents: 767
diff changeset
2202 case '-':
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2203 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2204 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2205
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2206 switch (c1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2207 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2208 case '+':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2209 case '-':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2210 // Unary ops, spacing doesn't matter.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2211 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2212
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2213 case '=':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2214 // Binary ops, spacing doesn't matter.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2215 bin_op = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2216 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2217
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2218 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2219 // Could be either, spacing matters.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2220 bin_op = looks_like_bin_op (spc_prev, c1);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2221 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2222 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2223
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2224 xunput (c1);
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2225 }
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2226 break;
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2227
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2228 case ':':
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2229 case '/':
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2230 case '\\':
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2231 case '^':
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2232 // Always a binary op (may also include /=, \=, and ^=).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2233 bin_op = true;
1276
cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe]
jwe
parents: 1273
diff changeset
2234 break;
cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe]
jwe
parents: 1273
diff changeset
2235
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2236 // .+ .- ./ .\ .^ .* .**
1554
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe]
jwe
parents: 1521
diff changeset
2237 case '.':
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe]
jwe
parents: 1521
diff changeset
2238 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2239 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2240
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2241 if (match_any (c1, "+-/\\^*"))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2242 // Always a binary op (may also include .+=, .-=, ./=, ...).
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2243 bin_op = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2244 else if (! isdigit (c1) && c1 != ' ' && c1 != '\t' && c1 != '.')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2245 // A structure element reference is a binary op.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2246 bin_op = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2247
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2248 xunput (c1);
1554
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe]
jwe
parents: 1521
diff changeset
2249 }
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe]
jwe
parents: 1521
diff changeset
2250 break;
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe]
jwe
parents: 1521
diff changeset
2251
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2252 // = == & && | || * **
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2253 case '=':
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2254 case '&':
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2255 case '|':
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2256 case '*':
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2257 // Always a binary op (may also include ==, &&, ||, **).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2258 bin_op = true;
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2259 break;
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2260
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2261 // < <= <> > >=
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2262 case '<':
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2263 case '>':
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2264 // Always a binary op (may also include <=, <>, >=).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2265 bin_op = true;
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2266 break;
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2267
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2268 // ~= !=
777
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe]
jwe
parents: 767
diff changeset
2269 case '~':
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe]
jwe
parents: 767
diff changeset
2270 case '!':
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2271 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2272 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2273
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2274 // ~ and ! can be unary ops, so require following =.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2275 if (c1 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2276 bin_op = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2277
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2278 xunput (c1);
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2279 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2280 break;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2281
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2282 default:
1276
cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe]
jwe
parents: 1273
diff changeset
2283 break;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2284 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2285
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2286 xunput (c0);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2287
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2288 return bin_op;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2289 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2290
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2291 // FIXME -- we need to handle block comments here.
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2292
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2293 void
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2294 lexical_feedback::scan_for_comments (const char *text)
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2295 {
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2296 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2297
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2298 bool in_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2299 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2300
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2301 int len = strlen (text);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2302 int i = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2303
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2304 while (i < len)
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2305 {
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2306 char c = text[i++];
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2307
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2308 switch (c)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2309 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2310 case '%':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2311 case '#':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2312 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2313 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2314 if (! beginning_of_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2315 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2316 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2317 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2318 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2319 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2320 in_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2321 beginning_of_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2322 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2323 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2324
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2325 case '\n':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2326 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2327 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2328 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2329 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2330 comment_buf.resize (0);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2331 in_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2332 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2333 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2334 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2335
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2336 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2337 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2338 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2339 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2340 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2341 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2342 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2343 }
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2344 }
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2345
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2346 if (! comment_buf.empty ())
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2347 octave_comment_buffer::append (comment_buf);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2348 }
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2349
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2350 // Discard whitespace, including comments and continuations.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2351
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2352 // FIXME -- we need to handle block comments here.
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2353
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2354 int
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2355 lexical_feedback::eat_whitespace (void)
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2356 {
16106
031117f4db7c use enum for values returned by eat_continuation and eat_whitespace
John W. Eaton <jwe@octave.org>
parents: 16105
diff changeset
2357 int retval = lexical_feedback::NO_WHITESPACE;
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2358
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2359 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2360
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2361 bool in_comment = false;
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2362 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2363
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2364 int c = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2365
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2366 while ((c = text_yyinput ()) != EOF)
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2367 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2368 current_input_column++;
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2369
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2370 switch (c)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2371 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2372 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2373 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2374 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2375 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2376 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2377 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2378 }
16106
031117f4db7c use enum for values returned by eat_continuation and eat_whitespace
John W. Eaton <jwe@octave.org>
parents: 16105
diff changeset
2379 retval |= lexical_feedback::SPACE_OR_TAB;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2380 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2381
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2382 case '\n':
16106
031117f4db7c use enum for values returned by eat_continuation and eat_whitespace
John W. Eaton <jwe@octave.org>
parents: 16105
diff changeset
2383 retval |= lexical_feedback::NEWLINE;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2384 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2385 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2386 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2387 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2388 comment_buf.resize (0);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2389 in_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2390 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2391 }
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2392 current_input_column = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2393 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2394
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2395 case '#':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2396 case '%':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2397 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2398 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2399 if (! beginning_of_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2400 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2401 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2402 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2403 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2404 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2405 in_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2406 beginning_of_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2407 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2408 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2409
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2410 case '.':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2411 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2412 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2413 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2414 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2415 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2416 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2417 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2418 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2419 if (have_ellipsis_continuation ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2420 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2421 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2422 goto done;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2423 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2424
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2425 case '\\':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2426 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2427 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2428 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2429 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2430 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2431 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2432 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2433 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2434 if (have_continuation ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2435 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2436 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2437 goto done;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2438 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2439
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2440 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2441 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2442 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2443 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2444 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2445 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2446 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2447 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2448 goto done;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2449 }
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2450 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2451
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2452 if (! comment_buf.empty ())
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2453 octave_comment_buffer::append (comment_buf);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2454
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2455 done:
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2456 xunput (c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2457 current_input_column--;
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2458 return retval;
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2459 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2460
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2461 static inline bool
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2462 looks_like_hex (const char *s, int len)
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2463 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2464 return (len > 2 && s[0] == '0' && (s[1] == 'x' || s[1] == 'X'));
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2465 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2466
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2467 void
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2468 lexical_feedback::handle_number (void)
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2469 {
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2470 double value = 0.0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2471 int nread = 0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2472
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2473 char *yytxt = flex_yytext ();
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2474
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2475 if (looks_like_hex (yytxt, strlen (yytxt)))
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2476 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2477 unsigned long ival;
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2478
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2479 nread = sscanf (yytxt, "%lx", &ival);
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2480
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2481 value = static_cast<double> (ival);
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2482 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2483 else
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2484 {
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2485 char *tmp = strsave (yytxt);
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2486
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2487 char *idx = strpbrk (tmp, "Dd");
2621
337a09dd1c06 [project @ 1997-01-24 21:49:41 by jwe]
jwe
parents: 2614
diff changeset
2488
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2489 if (idx)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2490 *idx = 'e';
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2491
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2492 nread = sscanf (tmp, "%lf", &value);
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2493
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2494 delete [] tmp;
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2495 }
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2496
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
2497 // If yytext doesn't contain a valid number, we are in deep doo doo.
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
2498
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2499 assert (nread == 1);
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2500
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2501 quote_is_transpose = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2502 convert_spaces_to_comma = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2503 looking_for_object_index = false;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2504 at_beginning_of_statement = false;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2505
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2506 push_token (new token (value, yytxt, input_line_number,
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2507 current_input_column));
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2508
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
2509 current_input_column += flex_yyleng ();
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2510
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2511 do_comma_insert_check ();
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2512 }
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2513
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2514 // We have seen a backslash and need to find out if it should be
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2515 // treated as a continuation character. If so, this eats it, up to
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2516 // and including the new line character.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2517 //
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2518 // Match whitespace only, followed by a comment character or newline.
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2519 // Once a comment character is found, discard all input until newline.
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2520 // If non-whitespace characters are found before comment
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2521 // characters, return 0. Otherwise, return 1.
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2522
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2523 // FIXME -- we need to handle block comments here.
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2524
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2525 bool
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2526 lexical_feedback::have_continuation (bool trailing_comments_ok)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2527 {
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
2528 std::ostringstream buf;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2529
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2530 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2531
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2532 bool in_comment = false;
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2533 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2534
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2535 int c = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2536
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2537 while ((c = text_yyinput ()) != EOF)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2538 {
3802
4f1a26a730fd [project @ 2001-02-26 20:26:14 by jwe]
jwe
parents: 3796
diff changeset
2539 buf << static_cast<char> (c);
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2540
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2541 switch (c)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2542 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2543 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2544 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2545 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2546 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2547 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2548 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2549 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2550 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2551
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2552 case '%':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2553 case '#':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2554 if (trailing_comments_ok)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2555 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2556 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2557 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2558 if (! beginning_of_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2559 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2560 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2561 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2562 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2563 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2564 in_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2565 beginning_of_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2566 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2567 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2568 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2569 goto cleanup;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2570 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2571
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2572 case '\n':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2573 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2574 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2575 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2576 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2577 }
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2578 current_input_column = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2579 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2580 gripe_matlab_incompatible_continuation ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2581 return true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2582
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2583 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2584 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2585 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2586 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2587 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2588 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2589 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2590 goto cleanup;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2591 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2592 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2593 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2594
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2595 xunput (c);
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2596 return false;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2597
3096
ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe]
jwe
parents: 3079
diff changeset
2598 cleanup:
4051
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe]
jwe
parents: 4037
diff changeset
2599
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
2600 std::string s = buf.str ();
4051
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe]
jwe
parents: 4037
diff changeset
2601
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe]
jwe
parents: 4037
diff changeset
2602 int len = s.length ();
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe]
jwe
parents: 4037
diff changeset
2603 while (len--)
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2604 xunput (s[len]);
3096
ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe]
jwe
parents: 3079
diff changeset
2605
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2606 return false;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2607 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2608
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
2609 // We have seen a '.' and need to see if it is the start of a
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2610 // continuation. If so, this eats it, up to and including the new
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2611 // line character.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2612
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2613 bool
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2614 lexical_feedback::have_ellipsis_continuation (bool trailing_comments_ok)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2615 {
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2616 char c1 = text_yyinput ();
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2617 if (c1 == '.')
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2618 {
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2619 char c2 = text_yyinput ();
1091
54abf1b3a8e9 [project @ 1995-02-02 00:30:14 by jwe]
jwe
parents: 1088
diff changeset
2620 if (c2 == '.' && have_continuation (trailing_comments_ok))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2621 return true;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2622 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2623 {
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2624 xunput (c2);
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2625 xunput (c1);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2626 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2627 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2628 else
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2629 xunput (c1);
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2630
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2631 return false;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2632 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2633
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2634 // See if we have a continuation line. If so, eat it and the leading
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2635 // whitespace on the next line.
16106
031117f4db7c use enum for values returned by eat_continuation and eat_whitespace
John W. Eaton <jwe@octave.org>
parents: 16105
diff changeset
2636
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2637 int
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2638 lexical_feedback::eat_continuation (void)
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2639 {
16106
031117f4db7c use enum for values returned by eat_continuation and eat_whitespace
John W. Eaton <jwe@octave.org>
parents: 16105
diff changeset
2640 int retval = lexical_feedback::NO_WHITESPACE;
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2641
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2642 int c = text_yyinput ();
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2643
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2644 if ((c == '.' && have_ellipsis_continuation ())
3105
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3103
diff changeset
2645 || (c == '\\' && have_continuation ()))
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2646 retval = eat_whitespace ();
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2647 else
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2648 xunput (c);
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2649
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2650 return retval;
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2651 }
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2652
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2653 int
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2654 lexical_feedback::handle_string (char delim)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2655 {
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
2656 std::ostringstream buf;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2657
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2658 int bos_line = input_line_number;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2659 int bos_col = current_input_column;
3805
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe]
jwe
parents: 3802
diff changeset
2660
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2661 int c;
1031
59f5eb2d5eb3 [project @ 1995-01-15 21:11:11 by jwe]
jwe
parents: 1019
diff changeset
2662 int escape_pending = 0;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2663
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2664 while ((c = text_yyinput ()) != EOF)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2665 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2666 current_input_column++;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2667
3105
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3103
diff changeset
2668 if (c == '\\')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2669 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2670 if (delim == '\'' || escape_pending)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2671 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2672 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2673 escape_pending = 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2674 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2675 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2676 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2677 if (have_continuation (false))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2678 escape_pending = 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2679 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2680 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2681 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2682 escape_pending = 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2683 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2684 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2685 continue;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2686 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2687 else if (c == '.')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2688 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2689 if (delim == '\'' || ! have_ellipsis_continuation (false))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2690 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2691 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2692 else if (c == '\n')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2693 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2694 error ("unterminated string constant");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2695 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2696 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2697 else if (c == delim)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2698 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2699 if (escape_pending)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2700 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2701 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2702 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2703 c = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2704 if (c == delim)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2705 {
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2706 buf << static_cast<char> (c);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2707 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2708 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2709 {
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2710 std::string s;
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2711 xunput (c);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2712
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2713 if (delim == '\'')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2714 s = buf.str ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2715 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2716 s = do_string_escapes (buf.str ());
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2717
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2718 quote_is_transpose = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2719 convert_spaces_to_comma = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2720
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2721 push_token (new token (s, bos_line, bos_col));
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2722
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2723 if (delim == '"')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2724 gripe_matlab_incompatible ("\" used as string delimiter");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2725 else if (delim == '\'')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2726 gripe_single_quote_string ();
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
2727
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2728 looking_for_object_index = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2729 at_beginning_of_statement = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2730
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2731 return delim == '"' ? DQ_STRING : SQ_STRING;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2732 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2733 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2734 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2735 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2736 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2737 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2738 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2739
1031
59f5eb2d5eb3 [project @ 1995-01-15 21:11:11 by jwe]
jwe
parents: 1019
diff changeset
2740 escape_pending = 0;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2741 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2742
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2743 return LEXICAL_ERROR;
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2744 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2745
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2746 bool
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2747 lexical_feedback::next_token_is_assign_op (void)
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2748 {
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2749 bool retval = false;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2750
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2751 int c0 = text_yyinput ();
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2752
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2753 switch (c0)
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2754 {
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2755 case '=':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2756 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2757 int c1 = text_yyinput ();
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2758 xunput (c1);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2759 if (c1 != '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2760 retval = true;
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2761 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2762 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2763
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2764 case '+':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2765 case '-':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2766 case '*':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2767 case '/':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2768 case '\\':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2769 case '&':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2770 case '|':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2771 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2772 int c1 = text_yyinput ();
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2773 xunput (c1);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2774 if (c1 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2775 retval = true;
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2776 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2777 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2778
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2779 case '.':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2780 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2781 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2782 if (match_any (c1, "+-*/\\"))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2783 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2784 int c2 = text_yyinput ();
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2785 xunput (c2);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2786 if (c2 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2787 retval = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2788 }
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2789 xunput (c1);
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2790 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2791 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2792
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2793 case '>':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2794 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2795 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2796 if (c1 == '>')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2797 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2798 int c2 = text_yyinput ();
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2799 xunput (c2);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2800 if (c2 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2801 retval = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2802 }
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2803 xunput (c1);
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2804 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2805 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2806
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2807 case '<':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2808 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2809 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2810 if (c1 == '<')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2811 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2812 int c2 = text_yyinput ();
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2813 xunput (c2);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2814 if (c2 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2815 retval = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2816 }
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2817 xunput (c1);
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2818 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2819 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2820
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2821 default:
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2822 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2823 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2824
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2825 xunput (c0);
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2826
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2827 return retval;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2828 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2829
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2830 bool
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2831 lexical_feedback::next_token_is_index_op (void)
4633
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2832 {
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2833 int c = text_yyinput ();
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2834 xunput (c);
4633
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2835 return c == '(' || c == '{';
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2836 }
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2837
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2838 int
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2839 lexical_feedback::handle_close_bracket (bool spc_gobbled, int bracket_type)
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2840 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
2841 OCTAVE_YYG;
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
2842
4612
d44675070f1a [project @ 2003-11-14 19:49:56 by jwe]
jwe
parents: 4608
diff changeset
2843 int retval = bracket_type;
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2844
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2845 if (! nesting_level.none ())
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2846 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2847 nesting_level.remove ();
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2848
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2849 if (bracket_type == ']')
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2850 bracketflag--;
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2851 else if (bracket_type == '}')
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2852 braceflag--;
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2853 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2854 panic_impossible ();
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2855 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2856
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2857 if (bracketflag == 0 && braceflag == 0)
4323
0990c9b77109 [project @ 2003-02-14 07:36:26 by jwe]
jwe
parents: 4318
diff changeset
2858 BEGIN (INITIAL);
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2859
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
2860 if (bracket_type == ']'
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
2861 && next_token_is_assign_op ()
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2862 && ! looking_at_return_list)
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2863 {
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2864 retval = CLOSE_BRACE;
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2865 }
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2866 else if ((bracketflag || braceflag)
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2867 && convert_spaces_to_comma
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2868 && (nesting_level.is_bracket ()
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2869 || (nesting_level.is_brace ()
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2870 && ! looking_at_object_index.front ())))
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2871 {
4633
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2872 bool index_op = next_token_is_index_op ();
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2873
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2874 // Don't insert comma if we are looking at something like
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2875 //
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2876 // [x{i}{j}] or [x{i}(j)]
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2877 //
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2878 // but do if we are looking at
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2879 //
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2880 // [x{i} {j}] or [x{i} (j)]
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2881
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2882 if (spc_gobbled || ! (bracket_type == '}' && index_op))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2883 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2884 bool bin_op = next_token_is_bin_op (spc_gobbled);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2885
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2886 bool postfix_un_op = next_token_is_postfix_unary_op (spc_gobbled);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2887
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2888 bool sep_op = next_token_is_sep_op ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2889
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2890 if (! (postfix_un_op || bin_op || sep_op))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2891 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2892 maybe_warn_separator_insert (',');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2893
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2894 xunput (',');
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2895 return retval;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2896 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2897 }
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2898 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2899
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2900 quote_is_transpose = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2901 convert_spaces_to_comma = true;
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2902
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2903 return retval;
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2904 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2905
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2906 void
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2907 lexical_feedback::maybe_unput_comma (int spc_gobbled)
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2908 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2909 if (nesting_level.is_bracket ()
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2910 || (nesting_level.is_brace ()
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2911 && ! looking_at_object_index.front ()))
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2912 {
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2913 int bin_op = next_token_is_bin_op (spc_gobbled);
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2914
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2915 int postfix_un_op = next_token_is_postfix_unary_op (spc_gobbled);
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2916
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2917 int c1 = text_yyinput ();
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2918 int c2 = text_yyinput ();
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
2919
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2920 xunput (c2);
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2921 xunput (c1);
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
2922
3263
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2923 int sep_op = next_token_is_sep_op ();
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
2924
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2925 int dot_op = (c1 == '.'
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2926 && (isalpha (c2) || isspace (c2) || c2 == '_'));
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
2927
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
2928 if (postfix_un_op || bin_op || sep_op || dot_op)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2929 return;
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
2930
3985
fa0ae9105656 [project @ 2002-07-11 04:02:00 by jwe]
jwe
parents: 3974
diff changeset
2931 int index_op = (c1 == '(' || c1 == '{');
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
2932
4476
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2933 // If there is no space before the indexing op, we don't insert
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2934 // a comma.
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2935
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2936 if (index_op && ! spc_gobbled)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2937 return;
4476
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2938
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2939 maybe_warn_separator_insert (',');
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2940
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2941 xunput (',');
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2942 }
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2943 }
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2944
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2945 bool
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2946 lexical_feedback::next_token_can_follow_bin_op (void)
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2947 {
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2948 std::stack<char> buf;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2949
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2950 int c = EOF;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2951
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2952 // Skip whitespace in current statement on current line
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2953 while (true)
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2954 {
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2955 c = text_yyinput ();
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2956
8767
026c6732ec7a lex.l (next_token_can_follow_bin_op): push all characters read on to buffer stack
John W. Eaton <jwe@octave.org>
parents: 8746
diff changeset
2957 buf.push (c);
026c6732ec7a lex.l (next_token_can_follow_bin_op): push all characters read on to buffer stack
John W. Eaton <jwe@octave.org>
parents: 8746
diff changeset
2958
026c6732ec7a lex.l (next_token_can_follow_bin_op): push all characters read on to buffer stack
John W. Eaton <jwe@octave.org>
parents: 8746
diff changeset
2959 if (match_any (c, ",;\n") || (c != ' ' && c != '\t'))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2960 break;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2961 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2962
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2963 // Restore input.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2964 while (! buf.empty ())
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2965 {
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2966 xunput (buf.top ());
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2967
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2968 buf.pop ();
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2969 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2970
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2971 return (isalnum (c) || match_any (c, "!\"'(-[_{~"));
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2972 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2973
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2974 static bool
10052
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2975 can_be_command (const std::string& tok)
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2976 {
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2977 // Don't allow these names to be treated as commands to avoid
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2978 // surprises when parsing things like "NaN ^2".
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2979
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2980 return ! (tok == "e"
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2981 || tok == "I" || tok == "i"
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2982 || tok == "J" || tok == "j"
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2983 || tok == "Inf" || tok == "inf"
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2984 || tok == "NaN" || tok == "nan");
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2985 }
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2986
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2987 bool
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2988 lexical_feedback::looks_like_command_arg (void)
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2989 {
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2990 bool retval = true;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2991
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2992 int c0 = text_yyinput ();
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2993
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2994 switch (c0)
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2995 {
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2996 // = ==
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2997 case '=':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2998 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2999 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3000
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3001 if (c1 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3002 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3003 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3004
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3005 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3006 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3007 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3008
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3009 xunput (c2);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3010 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3011 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3012 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3013
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3014 xunput (c1);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3015 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3016 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3017
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3018 case '(':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3019 case '{':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3020 // Indexing.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3021 retval = false;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3022 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3023
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3024 case '\n':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3025 // EOL.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3026 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3027
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3028 case '\'':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3029 case '"':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3030 // Beginning of a character string.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3031 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3032
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3033 // + - ++ -- += -=
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3034 case '+':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3035 case '-':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3036 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3037 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3038
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3039 switch (c1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3040 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3041 case '\n':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3042 // EOL.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3043 case '+':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3044 case '-':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3045 // Unary ops, spacing doesn't matter.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3046 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3047
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3048 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3049 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3050 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3051 if (next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3052 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3053 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3054 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3055
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3056 case '=':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3057 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3058 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3059
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3060 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3061 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3062 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3063
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3064 xunput (c2);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3065 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3066 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3067 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3068
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3069 xunput (c1);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3070 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3071 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3072
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3073 case ':':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3074 case '/':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3075 case '\\':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3076 case '^':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3077 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3078 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3079
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3080 if (! match_any (c1, ",;\n") && (c1 == ' ' || c1 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3081 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3082 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3083
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3084 xunput (c1);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3085 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3086 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3087
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3088 // .+ .- ./ .\ .^ .* .**
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3089 case '.':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3090 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3091 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3092
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3093 if (match_any (c1, "+-/\\^*"))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3094 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3095 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3096
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3097 if (c2 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3098 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3099 int c3 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3100
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3101 if (! match_any (c3, ",;\n") && (c3 == ' ' || c3 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3102 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3103 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3104
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3105 xunput (c3);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3106 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3107 else if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3108 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3109 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3110
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3111 xunput (c2);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3112 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3113 else if (! match_any (c1, ",;\n")
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3114 && (! isdigit (c1) && c1 != ' ' && c1 != '\t'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3115 && c1 != '.'))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3116 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3117 // Structure reference. FIXME -- is this a complete check?
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3118
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3119 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3120 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3121
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3122 xunput (c1);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3123 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3124 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3125
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3126 // & && | || * **
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3127 case '&':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3128 case '|':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3129 case '*':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3130 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3131 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3132
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3133 if (c1 == c0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3134 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3135 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3136
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3137 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3138 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3139 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3140
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3141 xunput (c2);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3142 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3143 else if (! match_any (c1, ",;\n") && (c1 == ' ' || c1 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3144 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3145 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3146
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3147 xunput (c1);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3148 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3149 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3150
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3151 // < <= > >=
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3152 case '<':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3153 case '>':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3154 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3155 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3156
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3157 if (c1 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3158 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3159 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3160
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3161 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3162 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3163 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3164
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3165 xunput (c2);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3166 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3167 else if (! match_any (c1, ",;\n") && (c1 == ' ' || c1 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3168 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3169 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3170
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3171 xunput (c1);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3172 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3173 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3174
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3175 // ~= !=
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3176 case '~':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3177 case '!':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3178 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3179 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3180
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3181 // ~ and ! can be unary ops, so require following =.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3182 if (c1 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3183 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3184 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3185
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3186 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3187 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3188 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3189
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3190 xunput (c2);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3191 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3192 else if (! match_any (c1, ",;\n") && (c1 == ' ' || c1 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3193 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3194 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3195
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3196 xunput (c1);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3197 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3198 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3199
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3200 default:
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3201 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3202 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3203
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3204 xunput (c0);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3205
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3206 return retval;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3207 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3208
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3209 int
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3210 lexical_feedback::handle_superclass_identifier (void)
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3211 {
16155
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
3212 char *yytxt = flex_yytext ();
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
3213 int c = yytxt[flex_yyleng()-1];
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
3214
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
3215 std::string meth = strip_trailing_whitespace (yytxt);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3216
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3217 int cont_is_spc = eat_continuation ();
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3218
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3219 int spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3220
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3221 size_t pos = meth.find ("@");
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3222 std::string cls = meth.substr (pos + 1);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3223 meth = meth.substr (0, pos);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3224
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3225 std::string pkg;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3226 pos = cls.find (".");
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3227 if (pos != std::string::npos)
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3228 {
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3229 pkg = cls.substr (0, pos);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3230 cls = cls.substr (pos + 1);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3231 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3232
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3233 int kw_token = (is_keyword_token (meth) || is_keyword_token (cls)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3234 || is_keyword_token (pkg));
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3235 if (kw_token)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3236 {
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3237 error ("method, class, and package names may not be keywords");
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3238 return LEXICAL_ERROR;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3239 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3240
16155
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
3241 push_token (new token (meth, pkg, cls, input_line_number,
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
3242 current_input_column));
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3243
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3244 do_comma_insert_check ();
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3245 maybe_unput_comma (spc_gobbled);
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
3246 current_input_column += flex_yyleng ();
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3247
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3248 return SUPERCLASSREF;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3249 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3250
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3251 int
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3252 lexical_feedback::handle_meta_identifier (void)
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3253 {
16155
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
3254 char *yytxt = flex_yytext ();
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
3255 int c = yytxt[flex_yyleng()-1];
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
3256
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
3257 std::string cls = strip_trailing_whitespace (yytxt).substr (1);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3258
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3259 int cont_is_spc = eat_continuation ();
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3260
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3261 int spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3262
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3263 std::string pkg;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3264 size_t pos = cls.find (".");
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3265 if (pos != std::string::npos)
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3266 {
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3267 pkg = cls.substr (0, pos);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3268 cls = cls.substr (pos + 1);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3269 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3270
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3271 int kw_token = is_keyword_token (cls) || is_keyword_token (pkg);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3272 if (kw_token)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3273 {
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3274 error ("class and package names may not be keywords");
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3275 return LEXICAL_ERROR;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3276 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3277
16155
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
3278 push_token (new token (pkg, cls, input_line_number,
0259254a3ccc maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 15576 16154
diff changeset
3279 current_input_column));
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3280
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3281 do_comma_insert_check ();
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3282 maybe_unput_comma (spc_gobbled);
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
3283 current_input_column += flex_yyleng ();
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3284
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3285 return METAQUERY;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3286 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3287
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
3288 // Figure out exactly what kind of token to return when we have seen
4238
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
3289 // an identifier. Handles keywords. Return -1 if the identifier
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
3290 // should be ignored.
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
3291
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3292 int
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3293 lexical_feedback::handle_identifier (void)
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3294 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
3295 OCTAVE_YYG;
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
3296
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3297 bool at_bos = at_beginning_of_statement;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3298
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
3299 char *yytxt = flex_yytext ();
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
3300
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
3301 std::string tok = strip_trailing_whitespace (yytxt);
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
3302
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
3303 int c = yytxt[flex_yyleng()-1];
3974
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3304
16106
031117f4db7c use enum for values returned by eat_continuation and eat_whitespace
John W. Eaton <jwe@octave.org>
parents: 16105
diff changeset
3305 bool cont_is_spc = (eat_continuation () != lexical_feedback::NO_WHITESPACE);
3974
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3306
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3307 int spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3308
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
3309 // If we are expecting a structure element, avoid recognizing
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
3310 // keywords and other special names and return STRUCT_ELT, which is
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
3311 // a string that is also a valid identifier. But first, we have to
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
3312 // decide whether to insert a comma.
747
6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe]
jwe
parents: 661
diff changeset
3313
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3314 if (looking_at_indirect_ref)
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
3315 {
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
3316 do_comma_insert_check ();
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
3317
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
3318 maybe_unput_comma (spc_gobbled);
2819
ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe]
jwe
parents: 2804
diff changeset
3319
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
3320 push_token (new token (tok, input_line_number,
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
3321 current_input_column));
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3322
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3323 quote_is_transpose = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3324 convert_spaces_to_comma = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3325 looking_for_object_index = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3326
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
3327 current_input_column += flex_yyleng ();
2819
ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe]
jwe
parents: 2804
diff changeset
3328
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
3329 return STRUCT_ELT;
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
3330 }
747
6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe]
jwe
parents: 661
diff changeset
3331
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3332 at_beginning_of_statement = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3333
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3334 // The is_keyword_token may reset
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3335 // at_beginning_of_statement. For example, if it sees
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3336 // an else token, then the next token is at the beginning of a
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3337 // statement.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3338
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3339 int kw_token = is_keyword_token (tok);
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3340
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3341 // If we found a keyword token, then the beginning_of_statement flag
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3342 // is already set. Otherwise, we won't be at the beginning of a
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3343 // statement.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3344
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3345 if (looking_at_function_handle)
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3346 {
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3347 if (kw_token)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3348 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3349 error ("function handles may not refer to keywords");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3350
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3351 return LEXICAL_ERROR;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3352 }
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3353 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3354 {
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
3355 push_token (new token (tok, input_line_number,
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
3356 current_input_column));
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3357
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
3358 current_input_column += flex_yyleng ();
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3359 quote_is_transpose = false;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3360 convert_spaces_to_comma = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3361 looking_for_object_index = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3362
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3363 return FCN_HANDLE;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3364 }
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3365 }
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3366
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
3367 // If we have a regular keyword, return it.
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3368 // Keywords can be followed by identifiers.
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3369
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3370 if (kw_token)
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3371 {
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3372 if (kw_token >= 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3373 {
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
3374 current_input_column += flex_yyleng ();
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3375 quote_is_transpose = false;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3376 convert_spaces_to_comma = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3377 looking_for_object_index = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3378 }
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3379
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3380 return kw_token;
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3381 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3382
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
3383 // See if we have a plot keyword (title, using, with, or clear).
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3384
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
3385 int c1 = text_yyinput ();
3480
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3386
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3387 bool next_tok_is_eq = false;
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3388 if (c1 == '=')
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3389 {
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
3390 int c2 = text_yyinput ();
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3391 xunput (c2);
3480
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3392
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3393 if (c2 != '=')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3394 next_tok_is_eq = true;
3480
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3395 }
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3396
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
3397 xunput (c1);
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
3398
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3399 // Kluge alert.
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3400 //
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3401 // If we are looking at a text style function, set up to gobble its
2745
76411ce43c05 [project @ 1997-02-26 07:52:14 by jwe]
jwe
parents: 2716
diff changeset
3402 // arguments.
76411ce43c05 [project @ 1997-02-26 07:52:14 by jwe]
jwe
parents: 2716
diff changeset
3403 //
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3404 // If the following token is '=', or if we are parsing a function
3189
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
3405 // return list or function parameter list, or if we are looking at
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
3406 // something like [ab,cd] = foo (), force the symbol to be inserted
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe]
jwe
parents: 3180
diff changeset
3407 // as a variable in the current symbol table.
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3408
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3409 if (! is_variable (tok))
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3410 {
10052
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
3411 if (at_bos && spc_gobbled && can_be_command (tok)
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
3412 && looks_like_command_arg ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3413 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3414 BEGIN (COMMAND_START);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3415 }
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3416 else if (next_tok_is_eq
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3417 || looking_at_decl_list
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3418 || looking_at_return_list
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3419 || (looking_at_parameter_list
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3420 && ! looking_at_initializer_expression))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3421 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3422 symbol_table::force_variable (tok);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3423 }
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3424 else if (looking_at_matrix_or_assign_lhs)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3425 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3426 pending_local_variables.insert (tok);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3427 }
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3428 }
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3429
4234
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe]
jwe
parents: 4233
diff changeset
3430 // Find the token in the symbol table. Beware the magic
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe]
jwe
parents: 4233
diff changeset
3431 // transformation of the end keyword...
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe]
jwe
parents: 4233
diff changeset
3432
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe]
jwe
parents: 4233
diff changeset
3433 if (tok == "end")
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3434 tok = "__end__";
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3435
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
3436 push_token (new token (&(symbol_table::insert (tok)),
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
3437 input_line_number, current_input_column));
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3438
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
3439 // After seeing an identifer, it is ok to convert spaces to a comma
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
3440 // (if needed).
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3441
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3442 convert_spaces_to_comma = true;
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3443
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3444 if (! (next_tok_is_eq || YY_START == COMMAND_START))
2877
5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe]
jwe
parents: 2861
diff changeset
3445 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3446 quote_is_transpose = true;
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3447
2877
5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe]
jwe
parents: 2861
diff changeset
3448 do_comma_insert_check ();
5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe]
jwe
parents: 2861
diff changeset
3449
5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe]
jwe
parents: 2861
diff changeset
3450 maybe_unput_comma (spc_gobbled);
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3451 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3452
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
3453 current_input_column += flex_yyleng ();
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3454
9324
29563379fa9b don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents: 8974
diff changeset
3455 if (tok != "__end__")
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3456 looking_for_object_index = true;
9324
29563379fa9b don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents: 8974
diff changeset
3457
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3458 return NAME;
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3459 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3460
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3461 void
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3462 lexical_feedback::maybe_warn_separator_insert (char sep)
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
3463 {
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
3464 std::string nm = curr_fcn_file_full_name;
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
3465
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3466 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3467 warning_with_id ("Octave:separator-insert",
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3468 "potential auto-insertion of '%c' near line %d",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3469 sep, input_line_number);
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3470 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3471 warning_with_id ("Octave:separator-insert",
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3472 "potential auto-insertion of '%c' near line %d of file %s",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3473 sep, input_line_number, nm.c_str ());
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
3474 }
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
3475
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3476 void
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3477 lexical_feedback::gripe_single_quote_string (void)
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
3478 {
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
3479 std::string nm = curr_fcn_file_full_name;
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
3480
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3481 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3482 warning_with_id ("Octave:single-quote-string",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3483 "single quote delimited string near line %d",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3484 input_line_number);
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3485 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3486 warning_with_id ("Octave:single-quote-string",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3487 "single quote delimited string near line %d of file %s",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3488 input_line_number, nm.c_str ());
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
3489 }
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
3490
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3491 void
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3492 lexical_feedback::gripe_matlab_incompatible (const std::string& msg)
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3493 {
8974
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
3494 std::string nm = curr_fcn_file_full_name;
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
3495
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
3496 if (nm.empty ())
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
3497 warning_with_id ("Octave:matlab-incompatible",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3498 "potential Matlab compatibility problem: %s",
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3499 msg.c_str ());
8974
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
3500 else
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
3501 warning_with_id ("Octave:matlab-incompatible",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3502 "potential Matlab compatibility problem: %s near line %d offile %s",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3503 msg.c_str (), input_line_number, nm.c_str ());
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3504 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3505
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3506 void
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3507 lexical_feedback::maybe_gripe_matlab_incompatible_comment (char c)
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3508 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3509 if (c == '#')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3510 gripe_matlab_incompatible ("# used as comment character");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3511 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3512
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3513 void
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3514 lexical_feedback::gripe_matlab_incompatible_continuation (void)
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3515 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3516 gripe_matlab_incompatible ("\\ used as line continuation marker");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3517 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3518
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3519 void
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
3520 lexical_feedback::gripe_matlab_incompatible_operator (const std::string& op)
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3521 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3522 std::string t = op;
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3523 int n = t.length ();
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3524 if (t[n-1] == '\n')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3525 t.resize (n-1);
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3526 gripe_matlab_incompatible (t + " used as operator");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3527 }
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3528
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3529 void
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3530 lexical_feedback::push_token (token *tok)
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3531 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
3532 YYSTYPE *lval = yyget_lval (scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
3533 lval->tok_val = tok;
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3534 token_stack.push (tok);
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3535 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3536
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3537 token *
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3538 lexical_feedback::current_token (void)
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3539 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
3540 YYSTYPE *lval = yyget_lval (scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
3541 return lval->tok_val;
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3542 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3543
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3544 void
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3545 lexical_feedback::display_token (int tok)
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3546 {
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3547 switch (tok)
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3548 {
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3549 case '=': std::cerr << "'='\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3550 case ':': std::cerr << "':'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3551 case '-': std::cerr << "'-'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3552 case '+': std::cerr << "'+'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3553 case '*': std::cerr << "'*'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3554 case '/': std::cerr << "'/'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3555 case ADD_EQ: std::cerr << "ADD_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3556 case SUB_EQ: std::cerr << "SUB_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3557 case MUL_EQ: std::cerr << "MUL_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3558 case DIV_EQ: std::cerr << "DIV_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3559 case LEFTDIV_EQ: std::cerr << "LEFTDIV_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3560 case POW_EQ: std::cerr << "POW_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3561 case EMUL_EQ: std::cerr << "EMUL_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3562 case EDIV_EQ: std::cerr << "EDIV_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3563 case ELEFTDIV_EQ: std::cerr << "ELEFTDIV_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3564 case EPOW_EQ: std::cerr << "EPOW_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3565 case AND_EQ: std::cerr << "AND_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3566 case OR_EQ: std::cerr << "OR_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3567 case LSHIFT_EQ: std::cerr << "LSHIFT_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3568 case RSHIFT_EQ: std::cerr << "RSHIFT_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3569 case LSHIFT: std::cerr << "LSHIFT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3570 case RSHIFT: std::cerr << "RSHIFT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3571 case EXPR_AND_AND: std::cerr << "EXPR_AND_AND\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3572 case EXPR_OR_OR: std::cerr << "EXPR_OR_OR\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3573 case EXPR_AND: std::cerr << "EXPR_AND\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3574 case EXPR_OR: std::cerr << "EXPR_OR\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3575 case EXPR_NOT: std::cerr << "EXPR_NOT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3576 case EXPR_LT: std::cerr << "EXPR_LT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3577 case EXPR_LE: std::cerr << "EXPR_LE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3578 case EXPR_EQ: std::cerr << "EXPR_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3579 case EXPR_NE: std::cerr << "EXPR_NE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3580 case EXPR_GE: std::cerr << "EXPR_GE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3581 case EXPR_GT: std::cerr << "EXPR_GT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3582 case LEFTDIV: std::cerr << "LEFTDIV\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3583 case EMUL: std::cerr << "EMUL\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3584 case EDIV: std::cerr << "EDIV\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3585 case ELEFTDIV: std::cerr << "ELEFTDIV\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3586 case EPLUS: std::cerr << "EPLUS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3587 case EMINUS: std::cerr << "EMINUS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3588 case QUOTE: std::cerr << "QUOTE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3589 case TRANSPOSE: std::cerr << "TRANSPOSE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3590 case PLUS_PLUS: std::cerr << "PLUS_PLUS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3591 case MINUS_MINUS: std::cerr << "MINUS_MINUS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3592 case POW: std::cerr << "POW\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3593 case EPOW: std::cerr << "EPOW\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3594
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3595 case NUM:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3596 case IMAG_NUM:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3597 {
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
3598 token *tok_val = current_token ();
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3599 std::cerr << (tok == NUM ? "NUM" : "IMAG_NUM")
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3600 << " [" << tok_val->number () << "]\n";
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3601 }
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3602 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3603
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3604 case STRUCT_ELT:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3605 {
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
3606 token *tok_val = current_token ();
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3607 std::cerr << "STRUCT_ELT [" << tok_val->text () << "]\n";
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3608 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3609 break;
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3610
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3611 case NAME:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3612 {
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
3613 token *tok_val = current_token ();
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3614 symbol_table::symbol_record *sr = tok_val->sym_rec ();
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3615 std::cerr << "NAME";
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3616 if (sr)
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3617 std::cerr << " [" << sr->name () << "]";
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3618 std::cerr << "\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3619 }
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3620 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3621
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3622 case END: std::cerr << "END\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3623
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3624 case DQ_STRING:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3625 case SQ_STRING:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3626 {
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
3627 token *tok_val = current_token ();
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3628
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3629 std::cerr << (tok == DQ_STRING ? "DQ_STRING" : "SQ_STRING")
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3630 << " [" << tok_val->text () << "]\n";
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3631 }
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3632 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3633
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3634 case FOR: std::cerr << "FOR\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3635 case WHILE: std::cerr << "WHILE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3636 case DO: std::cerr << "DO\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3637 case UNTIL: std::cerr << "UNTIL\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3638 case IF: std::cerr << "IF\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3639 case ELSEIF: std::cerr << "ELSEIF\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3640 case ELSE: std::cerr << "ELSE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3641 case SWITCH: std::cerr << "SWITCH\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3642 case CASE: std::cerr << "CASE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3643 case OTHERWISE: std::cerr << "OTHERWISE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3644 case BREAK: std::cerr << "BREAK\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3645 case CONTINUE: std::cerr << "CONTINUE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3646 case FUNC_RET: std::cerr << "FUNC_RET\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3647 case UNWIND: std::cerr << "UNWIND\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3648 case CLEANUP: std::cerr << "CLEANUP\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3649 case TRY: std::cerr << "TRY\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3650 case CATCH: std::cerr << "CATCH\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3651 case GLOBAL: std::cerr << "GLOBAL\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3652 case PERSISTENT: std::cerr << "PERSISTENT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3653 case FCN_HANDLE: std::cerr << "FCN_HANDLE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3654 case END_OF_INPUT: std::cerr << "END_OF_INPUT\n\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3655 case LEXICAL_ERROR: std::cerr << "LEXICAL_ERROR\n\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3656 case FCN: std::cerr << "FCN\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3657 case CLOSE_BRACE: std::cerr << "CLOSE_BRACE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3658 case SCRIPT_FILE: std::cerr << "SCRIPT_FILE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3659 case FUNCTION_FILE: std::cerr << "FUNCTION_FILE\n"; break;
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3660 case CLASSDEF_FILE: std::cerr << "CLASSDEF_FILE\n"; break;
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3661 case SUPERCLASSREF: std::cerr << "SUPERCLASSREF\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3662 case METAQUERY: std::cerr << "METAQUERY\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3663 case GET: std::cerr << "GET\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3664 case SET: std::cerr << "SET\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3665 case PROPERTIES: std::cerr << "PROPERTIES\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3666 case METHODS: std::cerr << "METHODS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3667 case EVENTS: std::cerr << "EVENTS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3668 case CLASSDEF: std::cerr << "CLASSDEF\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3669 case '\n': std::cerr << "\\n\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3670 case '\r': std::cerr << "\\r\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3671 case '\t': std::cerr << "TAB\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3672 default:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3673 {
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3674 if (tok < 256)
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3675 std::cerr << static_cast<char> (tok) << "\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3676 else
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3677 std::cerr << "UNKNOWN(" << tok << ")\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3678 }
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3679 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3680 }
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3681 }
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3682
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3683 static void
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3684 display_state (int state)
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3685 {
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3686 std::cerr << "S: ";
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3687
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3688 switch (state)
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3689 {
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3690 case INITIAL:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3691 std::cerr << "INITIAL" << std::endl;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3692 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3693
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3694 case COMMAND_START:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3695 std::cerr << "COMMAND_START" << std::endl;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3696 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3697
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3698 case MATRIX_START:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3699 std::cerr << "MATRIX_START" << std::endl;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3700 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3701
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3702 case SCRIPT_FILE_BEGIN:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3703 std::cerr << "SCRIPT_FILE_BEGIN" << std::endl;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3704 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3705
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3706 case FUNCTION_FILE_BEGIN:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3707 std::cerr << "FUNCTION_FILE_BEGIN" << std::endl;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3708 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3709
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3710 case CLASSDEF_FILE_BEGIN:
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3711 std::cerr << "CLASSDEF_FILE_BEGIN" << std::endl;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3712 break;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14647
diff changeset
3713
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3714 default:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3715 std::cerr << "UNKNOWN START STATE!" << std::endl;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3716 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3717 }
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3718 }
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3719
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3720 void
16129
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
3721 lexical_feedback::fatal_error (const char *msg)
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
3722 {
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
3723 error (msg);
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
3724
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
3725 OCTAVE_QUIT;
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
3726
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
3727 yy_fatal_error (msg, scanner);
16129
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
3728 }
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
3729
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
3730 void
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3731 lexical_feedback::lexer_debug (const char *pattern, const char *text)
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3732 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
3733 OCTAVE_YYG;
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
3734
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3735 std::cerr << std::endl;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3736
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3737 display_state (YY_START);
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3738
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3739 std::cerr << "P: " << pattern << std::endl;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3740 std::cerr << "T: " << text << std::endl;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3741 }