annotate libinterp/parse-tree/lex.ll @ 16103:6434f70f0ee0

move input_line_number and current_input_column to lexical_feedback class * lex.h, lex.ll (input_line_number, current_input_column): Move global variables to lexical_feedback class. Change all uses. (reset_parser): Don't reset input_line_number or current_input_column. * oct-parse.yy (eval_string, parse_fcn_file): Don't protect input_line_number or current_input_column here. (parse_fcn_file): Protect lexer_flags prior to calling gobble_leading_whitespace. Use reset_parser to reset lexer_flags.
author John W. Eaton <jwe@octave.org>
date Mon, 25 Feb 2013 21:30:51 -0500
parents 679a54d274d9
children c8974e28da59
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
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
23 %option prefix = "octave_"
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
24
10019
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
25 %top {
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
26 #ifdef HAVE_CONFIG_H
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
27 #include <config.h>
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
28 #endif
10411
479cc8a0a846 use gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
29
10019
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
30 }
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
31
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
32 %s COMMAND_START
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
33 %s MATRIX_START
4240
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
34
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
35 %x SCRIPT_FILE_BEGIN
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
36 %x FUNCTION_FILE_BEGIN
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
37
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
38 %{
240
a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe]
jwe
parents: 216
diff changeset
39
1341
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe]
jwe
parents: 1315
diff changeset
40 #include <cctype>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe]
jwe
parents: 1315
diff changeset
41 #include <cstring>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe]
jwe
parents: 1315
diff changeset
42
8950
d865363208d6 include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
43 #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
44 #include <set>
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
45 #include <sstream>
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
46 #include <string>
4214
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
47 #include <stack>
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
48
4093
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe]
jwe
parents: 4064
diff changeset
49 #include <sys/types.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe]
jwe
parents: 4064
diff changeset
50 #include <unistd.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe]
jwe
parents: 4064
diff changeset
51
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2900
diff changeset
52 #include "cmd-edit.h"
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4131
diff changeset
53 #include "quit.h"
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
54 #include "lo-mappers.h"
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2900
diff changeset
55
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
56 // These would be alphabetical, but y.tab.h must be included before
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
57 // oct-gperf.h and y.tab.h must be included after token.h and the tree
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
58 // class declarations. We can't include y.tab.h in oct-gperf.h
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
59 // 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
60 // times.
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
61
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
62 #include "Cell.h"
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
63 #include "comment-list.h"
2181
138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe]
jwe
parents: 2167
diff changeset
64 #include "defun.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
65 #include "error.h"
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
66 #include "gripes.h"
1351
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1341
diff changeset
67 #include "input.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
68 #include "lex.h"
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
69 #include "ov.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
70 #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
71 #include "parse-private.h"
2987
ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe]
jwe
parents: 2982
diff changeset
72 #include "pt-all.h"
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
73 #include "symtab.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
74 #include "token.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
75 #include "toplev.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
76 #include "utils.h"
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
77 #include "variables.h"
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents: 9476
diff changeset
78 #include <oct-parse.h>
2492
06595bc7f2d0 [project @ 1996-11-09 00:13:50 by jwe]
jwe
parents: 2375
diff changeset
79 #include <oct-gperf.h>
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
80
10426
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
81 #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
82 // 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
83 // 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
84 // 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
85 #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
86 #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
87 #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
88 #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
89 #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
90 #endif
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
91
2716
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
92 #if ! (defined (FLEX_SCANNER) \
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
93 && 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
94 && 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
95 #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
96 #endif
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
97
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
98 #define yylval octave_lval
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
99
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
100 // Arrange to get input via readline.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
101
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
102 #ifdef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
103 #undef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
104 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
105 #define YY_INPUT(buf, result, max_size) \
16098
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
106 result = octave_read (buf, max_size)
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
107
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
108 // 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
109 // The call to yy_fatal_error should never happen, but it avoids a
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
110 // 'static function defined but not used' warning from gcc.
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
111
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
112 #ifdef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
113 #undef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
114 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
115 #define YY_FATAL_ERROR(msg) \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
116 do \
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 error (msg); \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
119 OCTAVE_QUIT; \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
120 yy_fatal_error (msg); \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
121 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
122 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
123
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
124 #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
125 do \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
126 { \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
127 int tok_val = tok; \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
128 if (Vdisplay_tokens) \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
129 display_token (tok_val); \
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
130 if (lexer_debug_flag) \
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
131 { \
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
132 std::cerr << "R: "; \
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
133 display_token (tok_val); \
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
134 std::cerr << std::endl; \
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
135 } \
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
136 return tok_val; \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
137 } \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
138 while (0)
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
139
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
140 #define COUNT_TOK_AND_RETURN(tok) \
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
141 do \
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
142 { \
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
143 Vtoken_count++; \
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
144 DISPLAY_TOK_AND_RETURN (tok); \
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
145 } \
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
146 while (0)
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
147
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
148 #define TOK_RETURN(tok) \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
149 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
150 { \
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
151 lexer_flags.current_input_column += yyleng; \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
152 lexer_flags.quote_is_transpose = false; \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
153 lexer_flags.convert_spaces_to_comma = true; \
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
154 COUNT_TOK_AND_RETURN (tok); \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
155 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
156 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
157
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
158 #define TOK_PUSH_AND_RETURN(name, tok) \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
159 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
160 { \
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
161 yylval.tok_val = new token (name, lexer_flags.input_line_number, \
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
162 lexer_flags.current_input_column); \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
163 token_stack.push (yylval.tok_val); \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
164 TOK_RETURN (tok); \
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 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
167
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
168 #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
169 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
170 { \
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
171 yylval.tok_val = new token (lexer_flags.input_line_number, \
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
172 lexer_flags.current_input_column); \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
173 token_stack.push (yylval.tok_val); \
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
174 lexer_flags.current_input_column += yyleng; \
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
175 lexer_flags.quote_is_transpose = qit; \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
176 lexer_flags.convert_spaces_to_comma = convert; \
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
177 lexer_flags.looking_for_object_index = false; \
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
178 lexer_flags.at_beginning_of_statement = bos; \
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
179 COUNT_TOK_AND_RETURN (tok); \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
180 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
181 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
182
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
183 #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
184 do \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
185 { \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
186 gripe_matlab_incompatible_operator (yytext); \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
187 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
188 } \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
189 while (0)
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
190
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
191 #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
192 do \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
193 { \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
194 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
195 } \
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
196 while (0)
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
197
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
198 #define XBIN_OP_RETURN(tok, convert, bos) \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
199 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
200 { \
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
201 gripe_matlab_incompatible_operator (yytext); \
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
202 BIN_OP_RETURN (tok, convert, bos); \
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
203 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
204 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
205
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
206 #define LEXER_DEBUG(pattern) \
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
207 do \
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
208 { \
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
209 if (lexer_debug_flag) \
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
210 lexer_debug (pattern, yytext); \
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
211 } \
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
212 while (0)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
213
16100
6b26e18d1dcb reorder data members in lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16098
diff changeset
214 // The state of the lexer.
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
215 lexical_feedback lexer_flags;
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
216
1351
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1341
diff changeset
217 // Stack to hold tokens so that we can delete them when the parser is
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1341
diff changeset
218 // reset and avoid growing forever just because we are stashing some
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1341
diff changeset
219 // information. This has to appear before lex.h is included, because
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1341
diff changeset
220 // one of the macros defined there uses token_stack.
2614
ae47b0911863 [project @ 1997-01-21 03:57:46 by jwe]
jwe
parents: 2542
diff changeset
221 //
5775
ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe]
jwe
parents: 5765
diff changeset
222 // FIXME -- this should really be static, but that causes
2614
ae47b0911863 [project @ 1997-01-21 03:57:46 by jwe]
jwe
parents: 2542
diff changeset
223 // problems on some systems.
4214
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
224 std::stack <token*> token_stack;
1351
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1341
diff changeset
225
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
226 // Did eat_whitespace() eat a space or tab, or a newline, or both?
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
227
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
228 typedef int yum_yum;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
229
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
230 const yum_yum ATE_NOTHING = 0;
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
231 const yum_yum ATE_SPACE_OR_TAB = 1;
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
232 const yum_yum ATE_NEWLINE = 2;
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
233
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
234 // Is the closest nesting level a square bracket, squiggly brace or a paren?
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
235
4214
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
236 class bracket_brace_paren_nesting_level
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
237 {
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
238 public:
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
239
4214
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
240 bracket_brace_paren_nesting_level (void) : context () { }
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
241
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
242 ~bracket_brace_paren_nesting_level (void) { }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
243
4214
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
244 void bracket (void) { context.push (BRACKET); }
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
245 bool is_bracket (void)
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
246 { return ! context.empty () && context.top () == BRACKET; }
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
247
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
248 void brace (void) { context.push (BRACE); }
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
249 bool is_brace (void)
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
250 { return ! context.empty () && context.top () == BRACE; }
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
251
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
252 void paren (void) { context.push (PAREN); }
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
253 bool is_paren (void)
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
254 { return ! context.empty () && context.top () == PAREN; }
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
255
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
256 bool is_bracket_or_brace (void)
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
257 { return (! context.empty ()
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
258 && (context.top () == BRACKET || context.top () == BRACE)); }
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
259
4214
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
260 bool none (void) { return context.empty (); }
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
261
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
262 void remove (void) { if (! context.empty ()) context.pop (); }
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
263
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
264 void clear (void) { while (! context.empty ()) context.pop (); }
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
265
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
266 private:
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
267
4214
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
268 std::stack<int> context;
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
269
5225
6434e63553f0 [project @ 2005-03-17 17:53:01 by jwe]
jwe
parents: 5224
diff changeset
270 static const int BRACKET;
6434e63553f0 [project @ 2005-03-17 17:53:01 by jwe]
jwe
parents: 5224
diff changeset
271 static const int BRACE;
6434e63553f0 [project @ 2005-03-17 17:53:01 by jwe]
jwe
parents: 5224
diff changeset
272 static const int PAREN;
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
273
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
274 bracket_brace_paren_nesting_level (const bracket_brace_paren_nesting_level&);
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
275
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
276 bracket_brace_paren_nesting_level&
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
277 operator = (const bracket_brace_paren_nesting_level&);
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
278 };
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
279
5225
6434e63553f0 [project @ 2005-03-17 17:53:01 by jwe]
jwe
parents: 5224
diff changeset
280 const int bracket_brace_paren_nesting_level::BRACKET = 1;
6434e63553f0 [project @ 2005-03-17 17:53:01 by jwe]
jwe
parents: 5224
diff changeset
281 const int bracket_brace_paren_nesting_level::BRACE = 2;
6434e63553f0 [project @ 2005-03-17 17:53:01 by jwe]
jwe
parents: 5224
diff changeset
282 const int bracket_brace_paren_nesting_level::PAREN = 3;
6434e63553f0 [project @ 2005-03-17 17:53:01 by jwe]
jwe
parents: 5224
diff changeset
283
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
284 static bracket_brace_paren_nesting_level nesting_level;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
285
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
286 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
287
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
288 static unsigned int Vtoken_count = 0;
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
289
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
290 // The start state that was in effect when the beginning of a block
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
291 // comment was noticed.
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
292 static int block_comment_nesting_level = 0;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
293
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
294 // Internal variable for lexer debugging state.
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
295 static bool lexer_debug_flag = false;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
296
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
297 // Forward declarations for functions defined at the bottom of this
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
298 // file.
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
299
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
300 static int text_yyinput (void);
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
301 static void xunput (char c, char *buf);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
302 static void fixup_column_count (char *s);
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
303 static void do_comma_insert_check (void);
4867
c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe]
jwe
parents: 4765
diff changeset
304 static int is_keyword_token (const std::string& s);
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
305 static int process_comment (bool start_in_block, bool& eof);
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
306 static bool match_any (char c, const char *s);
3263
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
307 static bool next_token_is_sep_op (void);
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
308 static bool next_token_is_bin_op (bool spc_prev);
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
309 static bool next_token_is_postfix_unary_op (bool spc_prev);
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
310 static std::string strip_trailing_whitespace (char *s);
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
311 static void handle_number (void);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
312 static int handle_string (char delim);
4612
d44675070f1a [project @ 2003-11-14 19:49:56 by jwe]
jwe
parents: 4608
diff changeset
313 static int handle_close_bracket (bool spc_gobbled, int bracket_type);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
314 static int handle_superclass_identifier (void);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
315 static int handle_meta_identifier (void);
3974
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
316 static int handle_identifier (void);
3096
ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe]
jwe
parents: 3079
diff changeset
317 static bool have_continuation (bool trailing_comments_ok = true);
ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe]
jwe
parents: 3079
diff changeset
318 static bool have_ellipsis_continuation (bool trailing_comments_ok = true);
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
319 static void scan_for_comments (const char *);
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
320 static yum_yum eat_whitespace (void);
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
321 static yum_yum eat_continuation (void);
16098
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
322 static int octave_read (char *buf, unsigned int max_size);
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
323 static void maybe_warn_separator_insert (char sep);
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
324 static void gripe_single_quote_string (void);
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
325 static void gripe_matlab_incompatible (const std::string& msg);
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
326 static void maybe_gripe_matlab_incompatible_comment (char c);
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
327 static void gripe_matlab_incompatible_continuation (void);
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
328 static void gripe_matlab_incompatible_operator (const std::string& op);
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
329 static void display_token (int tok);
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
330 static void lexer_debug (const char *pattern, const char *text);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
331
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
332 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
333
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
334 D [0-9]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
335 S [ \t]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
336 NL ((\n)|(\r)|(\r\n))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
337 SNL ({S}|{NL})
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
338 EL (\.\.\.)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
339 BS (\\)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
340 CONT ({EL}|{BS})
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
341 Im [iIjJ]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
342 CCHAR [#%]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
343 COMMENT ({CCHAR}.*{NL})
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
344 SNLCMT ({SNL}|{COMMENT})
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
345 NOT ((\~)|(\!))
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
346 POW ((\*\*)|(\^))
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
347 EPOW (\.{POW})
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
348 IDENT ([_$a-zA-Z][_$a-zA-Z0-9]*)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
349 EXPON ([DdEe][+-]?{D}+)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
350 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
351 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
352
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
353 %{
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
354 // 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
355 // the parser go down a special path.
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
356 %}
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
357
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
358 <SCRIPT_FILE_BEGIN>. {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
359 LEXER_DEBUG ("<SCRIPT_FILE_BEGIN>.");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
360
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
361 BEGIN (INITIAL);
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
362 xunput (yytext[0], yytext);
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
363 COUNT_TOK_AND_RETURN (SCRIPT_FILE);
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
364 }
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
365
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
366 <FUNCTION_FILE_BEGIN>. {
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
367 LEXER_DEBUG ("<FUNCTION_FILE_BEGIN>.");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
368
4323
0990c9b77109 [project @ 2003-02-14 07:36:26 by jwe]
jwe
parents: 4318
diff changeset
369 BEGIN (INITIAL);
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
370 xunput (yytext[0], yytext);
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
371 COUNT_TOK_AND_RETURN (FUNCTION_FILE);
4238
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
372 }
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
373
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
374 %{
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
375 // Help and other command-style functions.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
376 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
377
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
378 <COMMAND_START>{NL} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
379 LEXER_DEBUG ("<COMMAND_START>{NL}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
380
4323
0990c9b77109 [project @ 2003-02-14 07:36:26 by jwe]
jwe
parents: 4318
diff changeset
381 BEGIN (INITIAL);
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
382 lexer_flags.input_line_number++;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
383 lexer_flags.current_input_column = 1;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
384
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
385 lexer_flags.quote_is_transpose = false;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
386 lexer_flags.convert_spaces_to_comma = true;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
387 lexer_flags.looking_for_object_index = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
388 lexer_flags.at_beginning_of_statement = true;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
389
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
390 COUNT_TOK_AND_RETURN ('\n');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
391 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
392
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
393 <COMMAND_START>[\;\,] {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
394 LEXER_DEBUG ("<COMMAND_START>[\\;\\,]");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
395
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
396 lexer_flags.looking_for_object_index = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
397 lexer_flags.at_beginning_of_statement = true;
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
398
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
399 BEGIN (INITIAL);
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
400
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
401 if (strcmp (yytext, ",") == 0)
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
402 TOK_RETURN (',');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
403 else
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
404 TOK_RETURN (';');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
405 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
406
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
407 <COMMAND_START>[\"\'] {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
408 LEXER_DEBUG ("<COMMAND_START>[\\\"\\']");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
409
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
410 lexer_flags.at_beginning_of_statement = false;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
411
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
412 lexer_flags.current_input_column++;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
413 int tok = handle_string (yytext[0]);
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
414
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
415 COUNT_TOK_AND_RETURN (tok);
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
416 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
417
4923
b11223097ad4 [project @ 2004-08-02 16:33:11 by jwe]
jwe
parents: 4910
diff changeset
418 <COMMAND_START>[^#% \t\r\n\;\,\"\'][^ \t\r\n\;\,]*{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
419 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
420
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
421 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
422
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
423 lexer_flags.looking_for_object_index = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
424 lexer_flags.at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
425
5279
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe]
jwe
parents: 5225
diff changeset
426 TOK_PUSH_AND_RETURN (tok, SQ_STRING);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
427 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
428
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
429 %{
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
430 // 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
431 // need to know if the next token is '=' or '=='.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
432 //
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
433 // 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
434 // 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
435 // operator.
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
436 //
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
437 // 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
438 // after seeing a ']' character...
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
439
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
440 // FIXME -- we need to handle block comments here.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
441 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
442
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
443 <MATRIX_START>{SNLCMT}*\]{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
444 LEXER_DEBUG ("<MATRIX_START>{SNLCMT}*\\]{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
445
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
446 scan_for_comments (yytext);
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
447 fixup_column_count (yytext);
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
448
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
449 lexer_flags.looking_at_object_index.pop_front ();
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
450
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
451 lexer_flags.looking_for_object_index = true;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
452 lexer_flags.at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
453
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
454 int c = yytext[yyleng-1];
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
455 int cont_is_spc = eat_continuation ();
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
456 bool spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
5345
2781568bf951 [project @ 2005-05-10 05:31:12 by jwe]
jwe
parents: 5307
diff changeset
457 int tok_to_return = handle_close_bracket (spc_gobbled, ']');
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
458
5345
2781568bf951 [project @ 2005-05-10 05:31:12 by jwe]
jwe
parents: 5307
diff changeset
459 if (spc_gobbled)
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
460 xunput (' ', yytext);
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
461
5345
2781568bf951 [project @ 2005-05-10 05:31:12 by jwe]
jwe
parents: 5307
diff changeset
462 COUNT_TOK_AND_RETURN (tok_to_return);
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
463 }
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
464
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
465 %{
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
466 // 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
467 %}
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
468
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
469 <MATRIX_START>{SNLCMT}*\}{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
470 LEXER_DEBUG ("<MATRIX_START>{SNLCMT}*\\}{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
471
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
472 scan_for_comments (yytext);
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
473 fixup_column_count (yytext);
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
474
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
475 lexer_flags.looking_at_object_index.pop_front ();
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
476
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
477 lexer_flags.looking_for_object_index = true;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
478 lexer_flags.at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
479
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
480 int c = yytext[yyleng-1];
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
481 int cont_is_spc = eat_continuation ();
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
482 bool spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
5345
2781568bf951 [project @ 2005-05-10 05:31:12 by jwe]
jwe
parents: 5307
diff changeset
483 int tok_to_return = handle_close_bracket (spc_gobbled, '}');
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
484
5345
2781568bf951 [project @ 2005-05-10 05:31:12 by jwe]
jwe
parents: 5307
diff changeset
485 if (spc_gobbled)
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
486 xunput (' ', yytext);
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
487
5345
2781568bf951 [project @ 2005-05-10 05:31:12 by jwe]
jwe
parents: 5307
diff changeset
488 COUNT_TOK_AND_RETURN (tok_to_return);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
489 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
490
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
491 %{
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
492 // 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
493 // 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
494 // commas.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
495 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
496
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
497 <MATRIX_START>{S}*\,{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
498 LEXER_DEBUG ("<MATRIX_START>{S}*\\,{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
499
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
500 lexer_flags.current_input_column += yyleng;
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
501
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
502 int tmp = eat_continuation ();
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
503
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
504 lexer_flags.quote_is_transpose = false;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
505 lexer_flags.convert_spaces_to_comma = true;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
506 lexer_flags.looking_for_object_index = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
507 lexer_flags.at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
508
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
509 if (! lexer_flags.looking_at_object_index.front ())
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
510 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
511 if ((tmp & ATE_NEWLINE) == ATE_NEWLINE)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
512 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
513 maybe_warn_separator_insert (';');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
514
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
515 xunput (';', yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
516 }
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
517 }
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
518
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
519 COUNT_TOK_AND_RETURN (',');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
520 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
521
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
522 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
523 // 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
524 // 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
525 // 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
526 // 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
527 %}
430
8464d5778a09 [project @ 1994-05-25 08:33:54 by jwe]
jwe
parents: 428
diff changeset
528
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
529 <MATRIX_START>{S}+ {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
530 LEXER_DEBUG ("<MATRIX_START>{S}+");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
531
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
532 lexer_flags.current_input_column += yyleng;
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
533
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
534 lexer_flags.at_beginning_of_statement = false;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
535
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
536 int tmp = eat_continuation ();
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
537
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
538 if (! lexer_flags.looking_at_object_index.front ())
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
539 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
540 bool bin_op = next_token_is_bin_op (true);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
541 bool postfix_un_op = next_token_is_postfix_unary_op (true);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
542 bool sep_op = next_token_is_sep_op ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
543
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
544 if (! (postfix_un_op || bin_op || sep_op)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
545 && nesting_level.is_bracket_or_brace ()
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
546 && lexer_flags.convert_spaces_to_comma)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
547 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
548 if ((tmp & ATE_NEWLINE) == ATE_NEWLINE)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
549 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
550 maybe_warn_separator_insert (';');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
551
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
552 xunput (';', yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
553 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
554
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
555 lexer_flags.quote_is_transpose = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
556 lexer_flags.convert_spaces_to_comma = true;
13260
28e3e9158d70 fix bug with parsing cell array lists
John W. Eaton <jwe@octave.org>
parents: 13249
diff changeset
557 lexer_flags.looking_for_object_index = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
558
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
559 maybe_warn_separator_insert (',');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
560
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
561 COUNT_TOK_AND_RETURN (',');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
562 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
563 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
564 }
430
8464d5778a09 [project @ 1994-05-25 08:33:54 by jwe]
jwe
parents: 428
diff changeset
565
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
566 %{
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
567 // 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
568 // 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
569 // semicolons.
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
570
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
571 // FIXME -- we need to handle block comments here.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
572 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
573
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
574 <MATRIX_START>{SNLCMT}*;{SNLCMT}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
575 LEXER_DEBUG ("<MATRIX_START>{SNLCMT}*;{SNLCMT}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
576
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
577 scan_for_comments (yytext);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
578 fixup_column_count (yytext);
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
579 eat_whitespace ();
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
580
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
581 lexer_flags.quote_is_transpose = false;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
582 lexer_flags.convert_spaces_to_comma = true;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
583 lexer_flags.looking_for_object_index = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
584 lexer_flags.at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
585
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
586 COUNT_TOK_AND_RETURN (';');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
587 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
588
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
589 %{
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
590 // 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
591 // 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
592 // semicolons.
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
593
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
594 // FIXME -- we need to handle block comments here.
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
595 %}
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
596
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
597 <MATRIX_START>{S}*{COMMENT}{SNLCMT}* |
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
598 <MATRIX_START>{S}*{NL}{SNLCMT}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
599 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
600
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
601 scan_for_comments (yytext);
1082
d1a1608f1028 [project @ 1995-01-27 22:26:33 by jwe]
jwe
parents: 1072
diff changeset
602 fixup_column_count (yytext);
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
603 eat_whitespace ();
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
604
4476
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
605 lexer_flags.quote_is_transpose = false;
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
606 lexer_flags.convert_spaces_to_comma = true;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
607 lexer_flags.at_beginning_of_statement = false;
4476
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
608
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
609 if (nesting_level.none ())
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
610 return LEXICAL_ERROR;
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
611
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
612 if (! lexer_flags.looking_at_object_index.front ()
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
613 && nesting_level.is_bracket_or_brace ())
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
614 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
615 maybe_warn_separator_insert (';');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
616
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
617 COUNT_TOK_AND_RETURN (';');
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
618 }
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
619 }
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
620
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
621 \[{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
622 LEXER_DEBUG ("\\[{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
623
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
624 nesting_level.bracket ();
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
625
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
626 lexer_flags.looking_at_object_index.push_front (false);
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
627
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
628 lexer_flags.current_input_column += yyleng;
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
629 lexer_flags.quote_is_transpose = false;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
630 lexer_flags.convert_spaces_to_comma = true;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
631 lexer_flags.looking_for_object_index = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
632 lexer_flags.at_beginning_of_statement = false;
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
633
11464
21b5284fa78d avoid error when parsing nested functions
John W. Eaton <jwe@octave.org>
parents: 11431
diff changeset
634 if (lexer_flags.defining_func
21b5284fa78d avoid error when parsing nested functions
John W. Eaton <jwe@octave.org>
parents: 11431
diff changeset
635 && ! lexer_flags.parsed_function_name.top ())
5615
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5570
diff changeset
636 lexer_flags.looking_at_return_list = true;
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5570
diff changeset
637 else
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5570
diff changeset
638 lexer_flags.looking_at_matrix_or_assign_lhs = true;
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5570
diff changeset
639
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
640 promptflag--;
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
641 eat_whitespace ();
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
642
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
643 lexer_flags.bracketflag++;
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
644 BEGIN (MATRIX_START);
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
645 COUNT_TOK_AND_RETURN ('[');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
646 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
647
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
648 \] {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
649 LEXER_DEBUG ("\\]");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
650
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
651 nesting_level.remove ();
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
652
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
653 lexer_flags.looking_at_object_index.pop_front ();
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
654
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
655 lexer_flags.looking_for_object_index = true;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
656 lexer_flags.at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
657
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
658 TOK_RETURN (']');
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
659 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
660
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
661 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
662 // Imaginary numbers.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
663 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
664
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
665 {NUMBER}{Im} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
666 LEXER_DEBUG ("{NUMBER}{Im}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
667
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
668 handle_number ();
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
669 COUNT_TOK_AND_RETURN (IMAG_NUM);
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
670 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
671
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
672 %{
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
673 // 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
674 // the constant.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
675 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
676
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
677 {D}+/\.[\*/\\^\'] |
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
678 {NUMBER} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
679 LEXER_DEBUG ("{D}+/\\.[\\*/\\^\\']|{NUMBER}");
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
680 handle_number ();
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
681 COUNT_TOK_AND_RETURN (NUM);
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
682 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
683
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
684 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
685 // 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
686 // the <MATRIX_START> start state code above.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
687 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
688
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
689 {S}* {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
690 lexer_flags.current_input_column += yyleng;
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
691 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
692
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
693 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
694 // Continuation lines. Allow comments after continuations.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
695 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
696
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
697 {CONT}{S}*{NL} |
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
698 {CONT}{S}*{COMMENT} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
699 LEXER_DEBUG ("{CONT}{S}*{NL}|{CONT}{S}*{COMMENT}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
700
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
701 if (yytext[0] == '\\')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
702 gripe_matlab_incompatible_continuation ();
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
703 scan_for_comments (yytext);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
704 promptflag--;
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
705 lexer_flags.input_line_number++;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
706 lexer_flags.current_input_column = 1;
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
707 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
708
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
709 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
710 // End of file.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
711 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
712
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
713 <<EOF>> {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
714 LEXER_DEBUG ("<<EOF>>");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
715
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
716 if (block_comment_nesting_level != 0)
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
717 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
718 warning ("block comment open at end of input");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
719
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
720 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
721 && ! 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
722 warning ("near line %d of file '%s.m'",
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
723 lexer_flags.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
724 }
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
725
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
726 TOK_RETURN (END_OF_INPUT);
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
727 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
728
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
729 %{
970
9382316a8a01 [project @ 1994-12-12 06:03:34 by jwe]
jwe
parents: 969
diff changeset
730 // 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
731 // don't write directly on yytext.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
732 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
733
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
734 {IDENT}{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
735 LEXER_DEBUG ("{IDENT}{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
736
4238
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
737 int id_tok = handle_identifier ();
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
738
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
739 if (id_tok >= 0)
9324
29563379fa9b don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents: 8974
diff changeset
740 COUNT_TOK_AND_RETURN (id_tok);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
741 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
742
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
743 %{
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
744 // Superclass method identifiers.
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
745 %}
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
746
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
747 {IDENT}@{IDENT}{S}* |
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
748 {IDENT}@{IDENT}.{IDENT}{S}* {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
749 LEXER_DEBUG ("{IDENT}@{IDENT}{S}*|{IDENT}@{IDENT}.{IDENT}{S}*");
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
750
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
751 int id_tok = handle_superclass_identifier ();
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
752
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
753 if (id_tok >= 0)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
754 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
755 lexer_flags.looking_for_object_index = true;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
756
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
757 COUNT_TOK_AND_RETURN (SUPERCLASSREF);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
758 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
759 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
760
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
761 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
762 // Metaclass query
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
763 %}
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
764
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
765 \?{IDENT}{S}* |
14638
5b0872b5b234 fix missing backslash quoting in lexer rules
John W. Eaton <jwe@octave.org>
parents: 14510
diff changeset
766 \?{IDENT}\.{IDENT}{S}* {
5b0872b5b234 fix missing backslash quoting in lexer rules
John W. Eaton <jwe@octave.org>
parents: 14510
diff changeset
767 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
768
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
769 int id_tok = handle_meta_identifier ();
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
770
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
771 if (id_tok >= 0)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
772 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
773 lexer_flags.looking_for_object_index = true;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
774
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
775 COUNT_TOK_AND_RETURN (METAQUERY);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
776 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
777 }
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
778
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
779 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
780 // Function handles and superclass references
4342
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
781 %}
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
782
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
783 "@" {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
784 LEXER_DEBUG ("@");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
785
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
786 lexer_flags.current_input_column++;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
787
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
788 lexer_flags.quote_is_transpose = false;
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
789 lexer_flags.convert_spaces_to_comma = false;
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
790 lexer_flags.looking_at_function_handle++;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
791 lexer_flags.looking_for_object_index = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
792 lexer_flags.at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
793
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
794 COUNT_TOK_AND_RETURN ('@');
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
795
4342
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
796 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
797
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
798 %{
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
799 // 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
800 // 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
801 // 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
802 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
803
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
804 {NL} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
805 LEXER_DEBUG ("{NL}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
806
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
807 lexer_flags.input_line_number++;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
808 lexer_flags.current_input_column = 1;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
809
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
810 lexer_flags.quote_is_transpose = false;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
811 lexer_flags.convert_spaces_to_comma = true;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
812
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
813 if (nesting_level.none ())
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
814 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
815 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
816 COUNT_TOK_AND_RETURN ('\n');
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
817 }
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
818 else if (nesting_level.is_paren ())
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
819 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
820 lexer_flags.at_beginning_of_statement = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
821 gripe_matlab_incompatible ("bare newline inside parentheses");
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
822 }
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
823 else if (nesting_level.is_bracket_or_brace ())
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
824 return LEXICAL_ERROR;
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
825 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
826
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
827 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
828 // 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
829 // operator.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
830 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
831
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
832 "'" {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
833 LEXER_DEBUG ("'");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
834
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
835 lexer_flags.current_input_column++;
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
836 lexer_flags.convert_spaces_to_comma = true;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
837
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
838 if (lexer_flags.quote_is_transpose)
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
839 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
840 do_comma_insert_check ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
841 COUNT_TOK_AND_RETURN (QUOTE);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
842 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
843 else
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
844 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
845 int tok = handle_string ('\'');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
846 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
847 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
848 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
849
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
850 %{
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
851 // Double quotes always begin strings.
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
852 %}
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
853
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
854 \" {
14642
6edd02858516 lex.ll: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents: 14638
diff changeset
855 LEXER_DEBUG ("\"");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
856
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
857 lexer_flags.current_input_column++;
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
858 int tok = handle_string ('"');
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
859
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
860 COUNT_TOK_AND_RETURN (tok);
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
861 }
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
862
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
863 %{
8536
de1b944d5306 lex.l: finish previous change
John W. Eaton <jwe@octave.org>
parents: 8535
diff changeset
864 // Gobble comments.
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
865 %}
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
866
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
867 {CCHAR} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
868 LEXER_DEBUG ("{CCHAR}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
869
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
870 lexer_flags.looking_for_object_index = false;
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
871
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
872 xunput (yytext[0], yytext);
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
873
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
874 bool eof = false;
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
875 int tok = process_comment (false, eof);
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
876
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
877 if (eof)
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
878 TOK_RETURN (END_OF_INPUT);
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
879 else if (tok > 0)
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
880 COUNT_TOK_AND_RETURN (tok);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
881 }
440
e27d10f2e573 [project @ 1994-05-30 03:33:37 by jwe]
jwe
parents: 430
diff changeset
882
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
883 %{
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
884 // Block comments.
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
885 %}
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
886
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
887 ^{S}*{CCHAR}\{{S}*{NL} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
888 LEXER_DEBUG ("^{S}*{CCHAR}\\{{S}*{NL}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
889
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
890 lexer_flags.looking_for_object_index = false;
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
891
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
892 lexer_flags.input_line_number++;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
893 lexer_flags.current_input_column = 1;
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
894 block_comment_nesting_level++;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
895 promptflag--;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
896
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
897 bool eof = false;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
898 process_comment (true, eof);
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
899 }
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
900
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
901 %{
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
902 // Other operators.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
903 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
904
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
905 ":" { LEXER_DEBUG (":"); BIN_OP_RETURN (':', false, false); }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
906
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
907 ".+" { LEXER_DEBUG (".+"); XBIN_OP_RETURN (EPLUS, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
908 ".-" { LEXER_DEBUG (".-"); XBIN_OP_RETURN (EMINUS, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
909 ".*" { LEXER_DEBUG (".*"); BIN_OP_RETURN (EMUL, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
910 "./" { LEXER_DEBUG ("./"); BIN_OP_RETURN (EDIV, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
911 ".\\" { LEXER_DEBUG (".\\"); BIN_OP_RETURN (ELEFTDIV, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
912 ".^" { LEXER_DEBUG (".^"); BIN_OP_RETURN (EPOW, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
913 ".**" { LEXER_DEBUG (".**"); XBIN_OP_RETURN (EPOW, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
914 ".'" { LEXER_DEBUG (".'"); do_comma_insert_check (); BIN_OP_RETURN (TRANSPOSE, true, false); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
915 "++" { LEXER_DEBUG ("++"); do_comma_insert_check (); XBIN_OP_RETURN_INTERNAL (PLUS_PLUS, true, false, true); }
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12174
diff changeset
916 "--" { LEXER_DEBUG ("--"); 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
917 "<=" { 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
918 "==" { 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
919 "~=" { 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
920 "!=" { 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
921 ">=" { 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
922 "&" { 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
923 "|" { 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
924 "<" { 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
925 ">" { 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
926 "+" { LEXER_DEBUG ("+"); BIN_OP_RETURN ('+', false, false); }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
927 "-" { LEXER_DEBUG ("-"); BIN_OP_RETURN ('-', false, false); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
928 "*" { LEXER_DEBUG ("*"); BIN_OP_RETURN ('*', false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
929 "/" { LEXER_DEBUG ("/"); BIN_OP_RETURN ('/', false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
930 "\\" { 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
931 ";" { LEXER_DEBUG (";"); BIN_OP_RETURN (';', true, true); }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
932 "," { LEXER_DEBUG (","); BIN_OP_RETURN (',', true, ! lexer_flags.looking_at_object_index.front ()); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
933 "^" { LEXER_DEBUG ("^"); BIN_OP_RETURN (POW, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
934 "**" { LEXER_DEBUG ("**"); XBIN_OP_RETURN (POW, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
935 "=" { LEXER_DEBUG ("="); BIN_OP_RETURN ('=', true, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
936 "&&" { 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
937 "||" { 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
938 "<<" { LEXER_DEBUG ("<<"); XBIN_OP_RETURN (LSHIFT, false, false); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
939 ">>" { 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
940
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
941 {NOT} {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
942 LEXER_DEBUG ("{NOT}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
943
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
944 if (yytext[0] == '~')
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
945 BIN_OP_RETURN (EXPR_NOT, false, false);
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
946 else
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
947 XBIN_OP_RETURN (EXPR_NOT, false, false);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
948 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
949
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
950 "(" {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
951 LEXER_DEBUG ("(");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
952
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
953 // 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
954 // 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
955 // 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
956 // the matching close paren).
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
957
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
958 lexer_flags.looking_at_object_index.push_front
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
959 (lexer_flags.looking_for_object_index);
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
960
4131
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe]
jwe
parents: 4101
diff changeset
961 lexer_flags.looking_at_indirect_ref = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
962 lexer_flags.looking_for_object_index = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
963 lexer_flags.at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
964
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
965 nesting_level.paren ();
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
966 promptflag--;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
967
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
968 TOK_RETURN ('(');
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
969 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
970
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
971 ")" {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
972 LEXER_DEBUG (")");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
973
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
974 nesting_level.remove ();
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
975 lexer_flags.current_input_column++;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
976
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
977 lexer_flags.looking_at_object_index.pop_front ();
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
978
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
979 lexer_flags.quote_is_transpose = true;
13237
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists.
John W. Eaton <jwe@octave.org>
parents: 12801
diff changeset
980 lexer_flags.convert_spaces_to_comma
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists.
John W. Eaton <jwe@octave.org>
parents: 12801
diff changeset
981 = (nesting_level.is_bracket_or_brace ()
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists.
John W. Eaton <jwe@octave.org>
parents: 12801
diff changeset
982 && ! lexer_flags.looking_at_anon_fcn_args);
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
983 lexer_flags.looking_for_object_index = true;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
984 lexer_flags.at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
985
13237
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists.
John W. Eaton <jwe@octave.org>
parents: 12801
diff changeset
986 if (lexer_flags.looking_at_anon_fcn_args)
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists.
John W. Eaton <jwe@octave.org>
parents: 12801
diff changeset
987 lexer_flags.looking_at_anon_fcn_args = false;
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists.
John W. Eaton <jwe@octave.org>
parents: 12801
diff changeset
988
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
989 do_comma_insert_check ();
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
990
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
991 COUNT_TOK_AND_RETURN (')');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
992 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
993
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
994 "." {
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
995 LEXER_DEBUG (".");
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
996
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
997 lexer_flags.looking_for_object_index = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
998 lexer_flags.at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
999
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1000 TOK_RETURN ('.');
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1001 }
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1002
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1003 "+=" { 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
1004 "-=" { 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
1005 "*=" { 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
1006 "/=" { 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
1007 "\\=" { 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
1008 ".+=" { 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
1009 ".-=" { 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
1010 ".*=" { 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
1011 "./=" { 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
1012 ".\\=" { 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
1013 {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
1014 {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
1015 "&=" { 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
1016 "|=" { 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
1017 "<<=" { 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
1018 ">>=" { 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
1019
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
1020 \{{S}* {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1021 LEXER_DEBUG ("\\{{S}*");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1022
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1023 nesting_level.brace ();
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
1024
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1025 lexer_flags.looking_at_object_index.push_front
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1026 (lexer_flags.looking_for_object_index);
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1027
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1028 lexer_flags.current_input_column += yyleng;
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
1029 lexer_flags.quote_is_transpose = false;
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
1030 lexer_flags.convert_spaces_to_comma = true;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1031 lexer_flags.looking_for_object_index = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
1032 lexer_flags.at_beginning_of_statement = false;
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
1033
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1034 promptflag--;
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
1035 eat_whitespace ();
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
1036
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
1037 lexer_flags.braceflag++;
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
1038 BEGIN (MATRIX_START);
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
1039 COUNT_TOK_AND_RETURN ('{');
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1040 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1041
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1042 "}" {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1043 LEXER_DEBUG ("}");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1044
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1045 lexer_flags.looking_at_object_index.pop_front ();
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1046
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1047 lexer_flags.looking_for_object_index = true;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
1048 lexer_flags.at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1049
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1050 nesting_level.remove ();
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1051
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
1052 TOK_RETURN ('}');
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1053 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1054
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1055 %{
2066
a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe]
jwe
parents: 2042
diff changeset
1056 // Unrecognized input is a lexical error.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1057 %}
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1058
2042
31f4f775b8c6 [project @ 1996-03-28 09:06:28 by jwe]
jwe
parents: 1994
diff changeset
1059 . {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1060 LEXER_DEBUG (".");
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1061
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1062 xunput (yytext[0], yytext);
4248
eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe]
jwe
parents: 4241
diff changeset
1063
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
1064 int c = text_yyinput ();
4248
eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe]
jwe
parents: 4241
diff changeset
1065
eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe]
jwe
parents: 4241
diff changeset
1066 if (c != EOF)
4240
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
1067 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1068 lexer_flags.current_input_column++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1069
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
1070 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
1071 undo_string_escape (static_cast<char> (c)), c,
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1072 lexer_flags.input_line_number, lexer_flags.current_input_column);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1073
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1074 return LEXICAL_ERROR;
4240
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
1075 }
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
1076 else
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
1077 TOK_RETURN (END_OF_INPUT);
2066
a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe]
jwe
parents: 2042
diff changeset
1078 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1079
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1080 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1081
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1082 // GAG.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1083 //
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1084 // If we're reading a matrix and the next character is '[', make sure
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1085 // that we insert a comma ahead of it.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1086
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
1087 void
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1088 do_comma_insert_check (void)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1089 {
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
1090 int spc_gobbled = eat_continuation ();
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
1091
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
1092 int c = text_yyinput ();
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
1093
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1094 xunput (c, yytext);
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
1095
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
1096 if (spc_gobbled)
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1097 xunput (' ', yytext);
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1098
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1099 lexer_flags.do_comma_insert = (! lexer_flags.looking_at_object_index.front ()
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1100 && lexer_flags.bracketflag && c == '[');
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1101 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1102
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1103 // Fix things up for errors or interrupts. The parser is never called
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1104 // recursively, so it is always safe to reinitialize its state before
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1105 // doing any parsing.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1106
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1107 void
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1108 reset_parser (void)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1109 {
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
1110 // Start off on the right foot.
4323
0990c9b77109 [project @ 2003-02-14 07:36:26 by jwe]
jwe
parents: 4318
diff changeset
1111 BEGIN (INITIAL);
4318
115bffcecfd3 [project @ 2003-02-13 05:52:16 by jwe]
jwe
parents: 4264
diff changeset
1112
14329
8d1ae996c122 also save and restore symbol table context in parser (bug #35448)
John W. Eaton <jwe@octave.org>
parents: 14294
diff changeset
1113 parser_symtab_context.clear ();
287
6027a905fc06 [project @ 1994-01-13 01:41:00 by jwe]
jwe
parents: 246
diff changeset
1114
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
1115 // We do want a prompt by default.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1116 promptflag = 1;
287
6027a905fc06 [project @ 1994-01-13 01:41:00 by jwe]
jwe
parents: 246
diff changeset
1117
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1118 // We are not in a block comment.
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1119 block_comment_nesting_level = 0;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1120
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1121 // Error may have occurred inside some brackets, braces, or parentheses.
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
1122 nesting_level.clear ();
287
6027a905fc06 [project @ 1994-01-13 01:41:00 by jwe]
jwe
parents: 246
diff changeset
1123
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
1124 // Clear out the stack of token info used to track line and column
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
1125 // numbers.
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 120
diff changeset
1126 while (! token_stack.empty ())
4214
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
1127 {
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
1128 delete token_stack.top ();
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
1129 token_stack.pop ();
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
1130 }
287
6027a905fc06 [project @ 1994-01-13 01:41:00 by jwe]
jwe
parents: 246
diff changeset
1131
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
1132 // Only ask for input from stdin if we are expecting interactive
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
1133 // input.
14074
f90c3facfac3 don't reset parser when exiting (bug #35120)
John W. Eaton <jwe@octave.org>
parents: 13973
diff changeset
1134
f90c3facfac3 don't reset parser when exiting (bug #35120)
John W. Eaton <jwe@octave.org>
parents: 13973
diff changeset
1135 if (! quitting_gracefully
f90c3facfac3 don't reset parser when exiting (bug #35120)
John W. Eaton <jwe@octave.org>
parents: 13973
diff changeset
1136 && (interactive || forced_interactive)
3880
c21ae2c5840f [project @ 2002-03-26 02:23:06 by jwe]
jwe
parents: 3867
diff changeset
1137 && ! (reading_fcn_file
14074
f90c3facfac3 don't reset parser when exiting (bug #35120)
John W. Eaton <jwe@octave.org>
parents: 13973
diff changeset
1138 || reading_classdef_file
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1139 || reading_script_file
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1140 || get_input_from_eval_string
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1141 || input_from_startup_file))
287
6027a905fc06 [project @ 1994-01-13 01:41:00 by jwe]
jwe
parents: 246
diff changeset
1142 yyrestart (stdin);
991
18be848f10a9 [project @ 1994-12-15 06:06:46 by jwe]
jwe
parents: 985
diff changeset
1143
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
1144 // Clear the buffer for help text.
4426
51a0dcde8778 [project @ 2003-06-13 19:16:37 by jwe]
jwe
parents: 4410
diff changeset
1145 while (! help_buf.empty ())
51a0dcde8778 [project @ 2003-06-13 19:16:37 by jwe]
jwe
parents: 4410
diff changeset
1146 help_buf.pop ();
1755
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1740
diff changeset
1147
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
1148 // Reset other flags.
16101
8d19626b38ae provide copy contructor and operator = for lexical_feedback class.
John W. Eaton <jwe@octave.org>
parents: 16100
diff changeset
1149 lexer_flags = lexical_feedback ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1150 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1151
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1152 static void
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1153 display_character (char c)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1154 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1155 if (isgraph (c))
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1156 std::cerr << c;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1157 else
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1158 switch (c)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1159 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1160 case 0:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1161 std::cerr << "NUL";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1162 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1163
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1164 case 1:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1165 std::cerr << "SOH";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1166 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1167
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1168 case 2:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1169 std::cerr << "STX";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1170 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1171
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1172 case 3:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1173 std::cerr << "ETX";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1174 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1175
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1176 case 4:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1177 std::cerr << "EOT";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1178 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1179
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1180 case 5:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1181 std::cerr << "ENQ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1182 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1183
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1184 case 6:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1185 std::cerr << "ACK";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1186 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1187
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1188 case 7:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1189 std::cerr << "\\a";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1190 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1191
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1192 case 8:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1193 std::cerr << "\\b";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1194 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1195
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1196 case 9:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1197 std::cerr << "\\t";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1198 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1199
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1200 case 10:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1201 std::cerr << "\\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1202 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1203
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1204 case 11:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1205 std::cerr << "\\v";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1206 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1207
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1208 case 12:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1209 std::cerr << "\\f";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1210 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1211
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1212 case 13:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1213 std::cerr << "\\r";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1214 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1215
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1216 case 14:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1217 std::cerr << "SO";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1218 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1219
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1220 case 15:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1221 std::cerr << "SI";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1222 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1223
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1224 case 16:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1225 std::cerr << "DLE";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1226 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1227
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1228 case 17:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1229 std::cerr << "DC1";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1230 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1231
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1232 case 18:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1233 std::cerr << "DC2";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1234 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1235
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1236 case 19:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1237 std::cerr << "DC3";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1238 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1239
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1240 case 20:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1241 std::cerr << "DC4";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1242 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1243
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1244 case 21:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1245 std::cerr << "NAK";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1246 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1247
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1248 case 22:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1249 std::cerr << "SYN";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1250 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1251
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1252 case 23:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1253 std::cerr << "ETB";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1254 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1255
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1256 case 24:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1257 std::cerr << "CAN";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1258 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1259
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1260 case 25:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1261 std::cerr << "EM";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1262 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1263
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1264 case 26:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1265 std::cerr << "SUB";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1266 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1267
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1268 case 27:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1269 std::cerr << "ESC";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1270 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1271
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1272 case 28:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1273 std::cerr << "FS";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1274 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1275
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1276 case 29:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1277 std::cerr << "GS";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1278 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1279
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1280 case 30:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1281 std::cerr << "RS";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1282 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1283
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1284 case 31:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1285 std::cerr << "US";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1286 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1287
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1288 case 32:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1289 std::cerr << "SPACE";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1290 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1291
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1292 case 127:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1293 std::cerr << "DEL";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1294 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1295 }
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1296 }
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1297
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1298 static int
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1299 text_yyinput (void)
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1300 {
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1301 int c = yyinput ();
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1302
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1303 if (lexer_debug_flag)
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1304 {
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1305 std::cerr << "I: ";
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1306 display_character (c);
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1307 std::cerr << std::endl;
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1308 }
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1309
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1310 // Convert CRLF into just LF and single CR into LF.
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1311
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1312 if (c == '\r')
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1313 {
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1314 c = yyinput ();
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1315
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1316 if (lexer_debug_flag)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1317 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1318 std::cerr << "I: ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1319 display_character (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1320 std::cerr << std::endl;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1321 }
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1322
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1323 if (c != '\n')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1324 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1325 xunput (c, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1326 c = '\n';
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1327 }
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1328 }
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1329
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1330 if (c == '\n')
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1331 lexer_flags.input_line_number++;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1332
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1333 return c;
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1334 }
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1335
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1336 static void
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1337 xunput (char c, char *buf)
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1338 {
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1339 if (lexer_debug_flag)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1340 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1341 std::cerr << "U: ";
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1342 display_character (c);
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1343 std::cerr << std::endl;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1344 }
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1345
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1346 if (c == '\n')
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1347 lexer_flags.input_line_number--;
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1348
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1349 yyunput (c, buf);
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1350 }
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1351
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1352 // If we read some newlines, we need figure out what column we're
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1353 // really looking at.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1354
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1355 static void
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1356 fixup_column_count (char *s)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1357 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1358 char c;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1359 while ((c = *s++) != '\0')
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1360 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1361 if (c == '\n')
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1362 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1363 lexer_flags.input_line_number++;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1364 lexer_flags.current_input_column = 1;
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1365 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1366 else
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1367 lexer_flags.current_input_column++;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1368 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1369 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1370
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1371 // Include these so that we don't have to link to libfl.a.
246
e4d5f689f06d [project @ 1993-12-04 20:01:37 by jwe]
jwe
parents: 240
diff changeset
1372
3332
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3263
diff changeset
1373 int
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1374 yywrap (void)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1375 {
287
6027a905fc06 [project @ 1994-01-13 01:41:00 by jwe]
jwe
parents: 246
diff changeset
1376 return 1;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1377 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1378
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1379 // Tell us all what the current buffer is.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1380
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1381 YY_BUFFER_STATE
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1382 current_buffer (void)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1383 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1384 return YY_CURRENT_BUFFER;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1385 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1386
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1387 // Create a new buffer.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1388
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1389 YY_BUFFER_STATE
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1390 create_buffer (FILE *f)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1391 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1392 return yy_create_buffer (f, YY_BUF_SIZE);
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1393 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1394
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1395 // Start reading a new buffer.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1396
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1397 void
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1398 switch_to_buffer (YY_BUFFER_STATE buf)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1399 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1400 yy_switch_to_buffer (buf);
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1401 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1402
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1403 // Delete a buffer.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1404
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1405 void
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1406 delete_buffer (YY_BUFFER_STATE buf)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1407 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1408 yy_delete_buffer (buf);
14510
c20de00a66a9 avoid memory error in 'octave --eval 0' (bug #36038)
Max Brister <max@2bass.com>
parents: 14329
diff changeset
1409
c20de00a66a9 avoid memory error in 'octave --eval 0' (bug #36038)
Max Brister <max@2bass.com>
parents: 14329
diff changeset
1410 // Prevent invalid yyin from being used by yyrestart.
c20de00a66a9 avoid memory error in 'octave --eval 0' (bug #36038)
Max Brister <max@2bass.com>
parents: 14329
diff changeset
1411 if (! current_buffer ())
c20de00a66a9 avoid memory error in 'octave --eval 0' (bug #36038)
Max Brister <max@2bass.com>
parents: 14329
diff changeset
1412 yyin = 0;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1413 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1414
13973
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1415 // Delete all buffers from the stack.
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1416 void
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1417 clear_all_buffers (void)
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1418 {
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1419 while (current_buffer ())
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1420 octave_pop_buffer_state ();
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1421 }
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1422
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1423 void
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1424 cleanup_parser (void)
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1425 {
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1426 reset_parser ();
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1427
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1428 clear_all_buffers ();
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1429 }
2c664266e9d0 clean up parser memory on exit
John W. Eaton <jwe@octave.org>
parents: 13260
diff changeset
1430
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1431 // Restore a buffer (for unwind-prot).
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1432
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1433 void
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1434 restore_input_buffer (void *buf)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1435 {
2861
6dcb8e1c9bb2 [project @ 1997-04-13 23:21:38 by jwe]
jwe
parents: 2857
diff changeset
1436 switch_to_buffer (static_cast<YY_BUFFER_STATE> (buf));
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1437 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1438
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1439 // Delete a buffer (for unwind-prot).
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
1440
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1441 void
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1442 delete_input_buffer (void *buf)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1443 {
2861
6dcb8e1c9bb2 [project @ 1997-04-13 23:21:38 by jwe]
jwe
parents: 2857
diff changeset
1444 delete_buffer (static_cast<YY_BUFFER_STATE> (buf));
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1445 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1446
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1447 static bool
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1448 inside_any_object_index (void)
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1449 {
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1450 bool retval = false;
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1451
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1452 for (std::list<bool>::const_iterator i = lexer_flags.looking_at_object_index.begin ();
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1453 i != lexer_flags.looking_at_object_index.end (); i++)
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1454 {
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1455 if (*i)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1456 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1457 retval = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1458 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1459 }
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1460 }
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1461
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1462 return retval;
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1463 }
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1464
4238
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
1465 // 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
1466
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1467 static int
4867
c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe]
jwe
parents: 4765
diff changeset
1468 is_keyword_token (const std::string& s)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1469 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1470 int l = lexer_flags.input_line_number;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1471 int c = lexer_flags.current_input_column;
3805
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe]
jwe
parents: 3802
diff changeset
1472
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
1473 int len = s.length ();
922
708827b941b4 [project @ 1994-11-14 22:14:13 by jwe]
jwe
parents: 916
diff changeset
1474
5088
7830f271a53f [project @ 2004-12-01 19:54:45 by jwe]
jwe
parents: 5035
diff changeset
1475 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
1476
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1477 if (kw)
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 120
diff changeset
1478 {
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1479 yylval.tok_val = 0;
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1480
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1481 switch (kw->kw_id)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1482 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1483 case break_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1484 case catch_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1485 case continue_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1486 case else_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1487 case otherwise_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1488 case return_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1489 case unwind_protect_cleanup_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1490 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1491 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1492
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1493 case static_kw:
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1494 if ((reading_fcn_file || reading_script_file
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1495 || reading_classdef_file)
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1496 && ! curr_fcn_file_full_name.empty ())
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1497 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
1498 "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'",
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1499 lexer_flags.input_line_number,
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1500 curr_fcn_file_full_name.c_str ());
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1501 else
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1502 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
1503 "the 'static' keyword is obsolete and will be removed from a future version of Octave; please use 'persistent' instead; near line %d",
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1504 lexer_flags.input_line_number);
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1505 // fall through ...
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1506
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1507 case persistent_kw:
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1508 break;
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1509
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1510 case case_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1511 case elseif_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1512 case global_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1513 case until_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1514 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1515
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1516 case end_kw:
14645
cbc00b587f36 also allow "end" indexing in classdef files
John W. Eaton <jwe@octave.org>
parents: 14642
diff changeset
1517 if (inside_any_object_index ()
cbc00b587f36 also allow "end" indexing in classdef files
John W. Eaton <jwe@octave.org>
parents: 14642
diff changeset
1518 || (! reading_classdef_file
cbc00b587f36 also allow "end" indexing in classdef files
John W. Eaton <jwe@octave.org>
parents: 14642
diff changeset
1519 && (lexer_flags.defining_func
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1520 && ! (lexer_flags.looking_at_return_list
14647
7c463e490062 * lex.ll: fix paren mismatch problem in previous change.
John W. Eaton <jwe@octave.org>
parents: 14645
diff changeset
1521 || lexer_flags.parsed_function_name.top ()))))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1522 return 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1523
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1524 yylval.tok_val = new token (token::simple_end, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1525 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1526 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1527
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1528 case end_try_catch_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1529 yylval.tok_val = new token (token::try_catch_end, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1530 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1531 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1532
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1533 case end_unwind_protect_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1534 yylval.tok_val = new token (token::unwind_protect_end, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1535 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1536 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1537
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1538 case endfor_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1539 yylval.tok_val = new token (token::for_end, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1540 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1541 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1542
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1543 case endfunction_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1544 yylval.tok_val = new token (token::function_end, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1545 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1546 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1547
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1548 case endif_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1549 yylval.tok_val = new token (token::if_end, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1550 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1551 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1552
13246
0c69a564f2be additional parfor changes
John W. Eaton <jwe@octave.org>
parents: 13245
diff changeset
1553 case endparfor_kw:
0c69a564f2be additional parfor changes
John W. Eaton <jwe@octave.org>
parents: 13245
diff changeset
1554 yylval.tok_val = new token (token::parfor_end, l, c);
0c69a564f2be additional parfor changes
John W. Eaton <jwe@octave.org>
parents: 13245
diff changeset
1555 lexer_flags.at_beginning_of_statement = true;
0c69a564f2be additional parfor changes
John W. Eaton <jwe@octave.org>
parents: 13245
diff changeset
1556 break;
0c69a564f2be additional parfor changes
John W. Eaton <jwe@octave.org>
parents: 13245
diff changeset
1557
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1558 case endswitch_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1559 yylval.tok_val = new token (token::switch_end, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1560 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1561 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1562
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1563 case endwhile_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1564 yylval.tok_val = new token (token::while_end, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1565 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1566 break;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1567
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1568 case endclassdef_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1569 yylval.tok_val = new token (token::classdef_end, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1570 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1571 break;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1572
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1573 case endenumeration_kw:
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1574 yylval.tok_val = new token (token::enumeration_end, l, c);
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1575 lexer_flags.at_beginning_of_statement = true;
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1576 break;
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1577
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1578 case endevents_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1579 yylval.tok_val = new token (token::events_end, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1580 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1581 break;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1582
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1583 case endmethods_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1584 yylval.tok_val = new token (token::methods_end, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1585 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1586 break;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1587
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1588 case endproperties_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1589 yylval.tok_val = new token (token::properties_end, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1590 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1591 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1592
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
1593
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1594 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
1595 case parfor_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1596 case while_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1597 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1598 lexer_flags.looping++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1599 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1600
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1601 case do_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1602 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1603 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1604 lexer_flags.looping++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1605 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1606
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1607 case try_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1608 case unwind_protect_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1609 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1610 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1611 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1612
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1613 case if_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1614 case switch_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1615 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1616 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1617
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1618 case get_kw:
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1619 case set_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1620 // 'get' and 'set' are keywords in classdef method
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1621 // declarations.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1622 if (! lexer_flags.maybe_classdef_get_set_method)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1623 return 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1624 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1625
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1626 case enumeration_kw:
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1627 case events_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1628 case methods_kw:
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1629 case properties_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1630 // 'properties', 'methods' and 'events' are keywords for
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1631 // classdef blocks.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1632 if (! lexer_flags.parsing_classdef)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1633 return 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1634 // fall through ...
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1635
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1636 case classdef_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1637 // 'classdef' is always a keyword.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1638 promptflag--;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1639 break;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1640
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1641 case function_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1642 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1643
11367
b2191ebea12f don't process input_event_hook when we are parsing a function
John W. Eaton <jwe@octave.org>
parents: 11217
diff changeset
1644 lexer_flags.defining_func++;
11464
21b5284fa78d avoid error when parsing nested functions
John W. Eaton <jwe@octave.org>
parents: 11431
diff changeset
1645 lexer_flags.parsed_function_name.push (false);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1646
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1647 if (! (reading_fcn_file || reading_script_file
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1648 || reading_classdef_file))
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1649 lexer_flags.input_line_number = 1;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1650 break;
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1651
3174
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe]
jwe
parents: 3165
diff changeset
1652 case magic_file_kw:
10315
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 if ((reading_fcn_file || reading_script_file
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1655 || reading_classdef_file)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1656 && ! curr_fcn_file_full_name.empty ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1657 yylval.tok_val = new token (curr_fcn_file_full_name, l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1658 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1659 yylval.tok_val = new token ("stdin", l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1660 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1661 break;
3174
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe]
jwe
parents: 3165
diff changeset
1662
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe]
jwe
parents: 3165
diff changeset
1663 case magic_line_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1664 yylval.tok_val = new token (static_cast<double> (l), "", l, c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1665 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1666
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1667 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1668 panic_impossible ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1669 }
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1670
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1671 if (! yylval.tok_val)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1672 yylval.tok_val = new token (l, c);
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1673
476
de9de43ad21f [project @ 1994-06-24 16:17:47 by jwe]
jwe
parents: 446
diff changeset
1674 token_stack.push (yylval.tok_val);
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1675
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1676 return kw->tok;
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 120
diff changeset
1677 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1678
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1679 return 0;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1680 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1681
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
1682 static bool
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
1683 is_variable (const std::string& name)
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
1684 {
8001
ff9e7873f8ea improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents: 7898
diff changeset
1685 return (symbol_table::is_variable (name)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1686 || (lexer_flags.pending_local_variables.find (name)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1687 != lexer_flags.pending_local_variables.end ()));
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
1688 }
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
1689
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1690 static std::string
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1691 grab_block_comment (stream_reader& reader, bool& eof)
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1692 {
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1693 std::string buf;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1694
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1695 bool at_bol = true;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1696 bool look_for_marker = false;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1697
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1698 bool warned_incompatible = false;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1699
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1700 int c = 0;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1701
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1702 while ((c = reader.getc ()) != EOF)
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1703 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1704 lexer_flags.current_input_column++;
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1705
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1706 if (look_for_marker)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1707 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1708 at_bol = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1709 look_for_marker = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1710
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1711 if (c == '{' || c == '}')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1712 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1713 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
1714
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1715 int type = c;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1716
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1717 bool done = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1718
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1719 while ((c = reader.getc ()) != EOF && ! done)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1720 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1721 lexer_flags.current_input_column++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1722
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1723 switch (c)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1724 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1725 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1726 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1727 tmp_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1728 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1729
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1730 case '\n':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1731 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1732 lexer_flags.current_input_column = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1733 at_bol = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1734 done = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1735
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1736 if (type == '{')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1737 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1738 block_comment_nesting_level++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1739 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1740 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1741 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1742 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1743 block_comment_nesting_level--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1744 promptflag++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1745
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1746 if (block_comment_nesting_level == 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1747 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1748 buf += grab_comment_block (reader, true, eof);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1749
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1750 return buf;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1751 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1752 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1753 }
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 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1757 at_bol = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1758 tmp_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1759 buf += tmp_buf;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1760 done = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1761 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1762 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1763 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1764 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1765 }
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1766
7898
cce16b4e0970 lex.l (grab_block_comment): Use parens around || expression within && expression
John W. Eaton <jwe@octave.org>
parents: 7728
diff changeset
1767 if (at_bol && (c == '%' || c == '#'))
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1768 {
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1769 if (c == '#' && ! warned_incompatible)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1770 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1771 warned_incompatible = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1772 maybe_gripe_matlab_incompatible_comment (c);
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
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1775 at_bol = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1776 look_for_marker = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1777 }
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1778 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1779 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1780 buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1781
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1782 if (c == '\n')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1783 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1784 lexer_flags.current_input_column = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1785 at_bol = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1786 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1787 }
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1788 }
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1789
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1790 if (c == EOF)
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1791 eof = true;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1792
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1793 return buf;
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1794 }
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1795
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1796 std::string
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1797 grab_comment_block (stream_reader& reader, bool at_bol,
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1798 bool& eof)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1799 {
4426
51a0dcde8778 [project @ 2003-06-13 19:16:37 by jwe]
jwe
parents: 4410
diff changeset
1800 std::string buf;
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
1801
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1802 // 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
1803 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
1804
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1805 // 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
1806 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
1807
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1808 bool warned_incompatible = false;
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
1809
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
1810 int c = 0;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1811
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1812 while ((c = reader.getc ()) != EOF)
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
1813 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1814 lexer_flags.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
1815
2300
9484969866d2 [project @ 1996-06-24 07:13:26 by jwe]
jwe
parents: 2200
diff changeset
1816 if (begin_comment)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1817 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1818 if (c == '%' || c == '#')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1819 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1820 at_bol = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1821 continue;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1822 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1823 else if (at_bol && c == '{')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1824 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1825 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
1826
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1827 bool done = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1828
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1829 while ((c = reader.getc ()) != EOF && ! done)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1830 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1831 lexer_flags.current_input_column++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1832
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1833 switch (c)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1834 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1835 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1836 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1837 tmp_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1838 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1839
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1840 case '\n':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1841 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1842 lexer_flags.current_input_column = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1843 at_bol = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1844 done = true;
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 block_comment_nesting_level++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1847 promptflag--;
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 buf += grab_block_comment (reader, eof);
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 in_comment = false;
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 if (eof)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1854 goto done;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1855 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1856 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1857
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1858 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1859 at_bol = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1860 tmp_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1861 buf += tmp_buf;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1862 done = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1863 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1864 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1865 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1866 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1867 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1868 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1869 at_bol = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1870 begin_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1871 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1872 }
2300
9484969866d2 [project @ 1996-06-24 07:13:26 by jwe]
jwe
parents: 2200
diff changeset
1873
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
1874 if (in_comment)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1875 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1876 buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1877
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1878 if (c == '\n')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1879 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1880 at_bol = true;
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1881 lexer_flags.current_input_column = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1882 in_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1883
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1884 // FIXME -- bailing out here prevents things like
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 // octave> # comment
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1887 // octave> x = 1
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1888 //
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1889 // from failing at the command line, while still
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1890 // allowing blocks of comments to be grabbed properly
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1891 // 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
1892 // 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
1893 // 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
1894 // better way of collecting these comments...
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1895 if (! (reading_fcn_file || reading_script_file))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1896 goto done;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1897 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1898 }
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
1899 else
10315
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 switch (c)
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 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1904 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1905 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1906
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1907 case '#':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1908 if (! warned_incompatible)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1909 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1910 warned_incompatible = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1911 maybe_gripe_matlab_incompatible_comment (c);
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 // fall through...
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1914
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1915 case '%':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1916 in_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1917 begin_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1918 break;
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 default:
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1921 lexer_flags.current_input_column--;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1922 reader.ungetc (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1923 goto done;
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 }
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
1926 }
991
18be848f10a9 [project @ 1994-12-15 06:06:46 by jwe]
jwe
parents: 985
diff changeset
1927
1019
7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe]
jwe
parents: 1009
diff changeset
1928 done:
991
18be848f10a9 [project @ 1994-12-15 06:06:46 by jwe]
jwe
parents: 985
diff changeset
1929
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1930 if (c == EOF)
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1931 eof = true;
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1932
4426
51a0dcde8778 [project @ 2003-06-13 19:16:37 by jwe]
jwe
parents: 4410
diff changeset
1933 return buf;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1934 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1935
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1936 class
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1937 flex_stream_reader : public stream_reader
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1938 {
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1939 public:
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1940 flex_stream_reader (char *buf_arg) : stream_reader (), buf (buf_arg) { }
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1941
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
1942 int getc (void) { return ::text_yyinput (); }
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1943 int ungetc (int c) { ::xunput (c, buf); return 0; }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1944
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1945 private:
12122
f4689107dd8c Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents: 11586
diff changeset
1946
f4689107dd8c Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents: 11586
diff changeset
1947 // No copying!
f4689107dd8c Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents: 11586
diff changeset
1948
f4689107dd8c Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents: 11586
diff changeset
1949 flex_stream_reader (const flex_stream_reader&);
f4689107dd8c Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents: 11586
diff changeset
1950
12174
db1f49eaba6b whitespace fixes
John W. Eaton <jwe@octave.org>
parents: 12122
diff changeset
1951 flex_stream_reader& operator = (const flex_stream_reader&);
12122
f4689107dd8c Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents: 11586
diff changeset
1952
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 char *buf;
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1954 };
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1955
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1956 static int
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1957 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
1958 {
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1959 eof = false;
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1960
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1961 std::string help_txt;
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1962
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1963 if (! help_buf.empty ())
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1964 help_txt = help_buf.top ();
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1965
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1966 flex_stream_reader flex_reader (yytext);
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1967
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1968 // 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
1969 // initially looking at a block comment.
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1970
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1971 std::string txt = start_in_block
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1972 ? grab_block_comment (flex_reader, eof)
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
1973 : 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
1974
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1975 if (lexer_debug_flag)
8536
de1b944d5306 lex.l: finish previous change
John W. Eaton <jwe@octave.org>
parents: 8535
diff changeset
1976 std::cerr << "C: " << txt << std::endl;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1977
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1978 if (help_txt.empty () && nesting_level.none ())
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1979 {
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1980 if (! help_buf.empty ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1981 help_buf.pop ();
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1982
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1983 help_buf.push (txt);
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1984 }
7720
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1985
4e2eafef689c unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents: 7715
diff changeset
1986 octave_comment_buffer::append (txt);
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1987
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
1988 lexer_flags.current_input_column = 1;
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1989 lexer_flags.quote_is_transpose = false;
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1990 lexer_flags.convert_spaces_to_comma = true;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
1991 lexer_flags.at_beginning_of_statement = true;
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1992
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1993 if (YY_START == COMMAND_START)
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1994 BEGIN (INITIAL);
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1995
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1996 if (nesting_level.none ())
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
1997 return '\n';
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1998 else if (nesting_level.is_bracket_or_brace ())
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
1999 return ';';
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2000 else
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2001 return 0;
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2002 }
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
2003
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2004 // Return 1 if the given character matches any character in the given
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2005 // string.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2006
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2007 static bool
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2764
diff changeset
2008 match_any (char c, const char *s)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2009 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2010 char tmp;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2011 while ((tmp = *s++) != '\0')
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2012 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2013 if (c == tmp)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2014 return true;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2015 }
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2016 return false;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2017 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2018
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2019 // Given information about the spacing surrounding an operator,
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2020 // return 1 if it looks like it should be treated as a binary
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2021 // operator. For example,
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2022 //
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2023 // [ 1 + 2 ] or [ 1+ 2] or [ 1+2 ] ==> binary
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2024 //
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2025 // [ 1 +2 ] ==> unary
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2026
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2027 static bool
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2028 looks_like_bin_op (bool spc_prev, int next_char)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2029 {
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2030 bool spc_next = (next_char == ' ' || next_char == '\t');
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2031
608
a675e03540dd [project @ 1994-08-13 23:50:19 by jwe]
jwe
parents: 584
diff changeset
2032 return ((spc_prev && spc_next) || ! spc_prev);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2033 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2034
3263
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2035 // 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
2036 // replaced by a single LF.
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2037
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2038 static bool
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2039 next_token_is_sep_op (void)
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2040 {
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2041 bool retval = false;
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2042
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
2043 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
2044
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2045 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
2046
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2047 xunput (c, yytext);
3263
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2048
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2049 return retval;
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2050 }
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2051
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2052 // 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
2053 // 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
2054
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2055 static bool
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2056 next_token_is_postfix_unary_op (bool spc_prev)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2057 {
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2058 bool un_op = false;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2059
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
2060 int c0 = text_yyinput ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2061
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2062 if (c0 == '\'' && ! spc_prev)
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2063 {
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2064 un_op = true;
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2065 }
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2066 else if (c0 == '.')
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2067 {
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
2068 int c1 = text_yyinput ();
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2069 un_op = (c1 == '\'');
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2070 xunput (c1, yytext);
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2071 }
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2072 else if (c0 == '+')
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2073 {
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
2074 int c1 = text_yyinput ();
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2075 un_op = (c1 == '+');
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2076 xunput (c1, yytext);
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2077 }
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2078 else if (c0 == '-')
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2079 {
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
2080 int c1 = text_yyinput ();
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2081 un_op = (c1 == '-');
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2082 xunput (c1, yytext);
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2083 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2084
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2085 xunput (c0, yytext);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2086
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2087 return un_op;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2088 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2089
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2090 // 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
2091 // operator.
1521
b3e4ca4f75a0 [project @ 1995-10-04 05:10:36 by jwe]
jwe
parents: 1520
diff changeset
2092 //
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2093 // 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
2094 // 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
2095 // 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
2096 // 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
2097 //
3779
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe]
jwe
parents: 3774
diff changeset
2098 // 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
2099 // (e.g., the characters '[' 'a' ' ' '+' '\' LFD 'b' ']') will be
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe]
jwe
parents: 3774
diff changeset
2100 // parsed as a binary operator.
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2101
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2102 static bool
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2103 next_token_is_bin_op (bool spc_prev)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2104 {
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2105 bool bin_op = false;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2106
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
2107 int c0 = text_yyinput ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2108
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2109 switch (c0)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2110 {
777
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe]
jwe
parents: 767
diff changeset
2111 case '+':
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe]
jwe
parents: 767
diff changeset
2112 case '-':
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2113 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2114 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2115
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2116 switch (c1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2117 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2118 case '+':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2119 case '-':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2120 // Unary ops, spacing doesn't matter.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2121 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2122
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2123 case '=':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2124 // Binary ops, spacing doesn't matter.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2125 bin_op = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2126 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2127
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2128 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2129 // Could be either, spacing matters.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2130 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
2131 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2132 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2133
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2134 xunput (c1, yytext);
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2135 }
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2136 break;
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2137
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2138 case ':':
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2139 case '/':
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2140 case '\\':
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2141 case '^':
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2142 // Always a binary op (may also include /=, \=, and ^=).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2143 bin_op = true;
1276
cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe]
jwe
parents: 1273
diff changeset
2144 break;
cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe]
jwe
parents: 1273
diff changeset
2145
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2146 // .+ .- ./ .\ .^ .* .**
1554
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe]
jwe
parents: 1521
diff changeset
2147 case '.':
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe]
jwe
parents: 1521
diff changeset
2148 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2149 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2150
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2151 if (match_any (c1, "+-/\\^*"))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2152 // Always a binary op (may also include .+=, .-=, ./=, ...).
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2153 bin_op = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2154 else if (! isdigit (c1) && c1 != ' ' && c1 != '\t' && c1 != '.')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2155 // A structure element reference is a binary op.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2156 bin_op = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2157
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2158 xunput (c1, yytext);
1554
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe]
jwe
parents: 1521
diff changeset
2159 }
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe]
jwe
parents: 1521
diff changeset
2160 break;
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe]
jwe
parents: 1521
diff changeset
2161
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2162 // = == & && | || * **
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2163 case '=':
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2164 case '&':
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2165 case '|':
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2166 case '*':
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2167 // Always a binary op (may also include ==, &&, ||, **).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2168 bin_op = true;
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2169 break;
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2170
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2171 // < <= <> > >=
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2172 case '<':
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2173 case '>':
3774
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2174 // Always a binary op (may also include <=, <>, >=).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2175 bin_op = true;
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2176 break;
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2177
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe]
jwe
parents: 3698
diff changeset
2178 // ~= !=
777
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe]
jwe
parents: 767
diff changeset
2179 case '~':
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe]
jwe
parents: 767
diff changeset
2180 case '!':
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2181 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2182 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2183
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2184 // ~ and ! can be unary ops, so require following =.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2185 if (c1 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2186 bin_op = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2187
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2188 xunput (c1, yytext);
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2189 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2190 break;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2191
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2192 default:
1276
cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe]
jwe
parents: 1273
diff changeset
2193 break;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2194 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2195
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2196 xunput (c0, yytext);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2197
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2198 return bin_op;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2199 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2200
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2201 // Used to delete trailing white space from tokens.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2202
3536
e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe]
jwe
parents: 3523
diff changeset
2203 static std::string
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2204 strip_trailing_whitespace (char *s)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2205 {
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
2206 std::string retval = s;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2207
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
2208 size_t pos = retval.find_first_of (" \t");
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2209
8021
85184151822e fix typo in NPOS change
John W. Eaton <jwe@octave.org>
parents: 8019
diff changeset
2210 if (pos != std::string::npos)
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
2211 retval.resize (pos);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2212
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2213 return retval;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2214 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2215
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2216 // 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
2217
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2218 static void
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2219 scan_for_comments (const char *text)
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2220 {
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2221 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2222
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2223 bool in_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2224 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2225
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2226 int len = strlen (text);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2227 int i = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2228
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2229 while (i < len)
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2230 {
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2231 char c = text[i++];
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2232
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2233 switch (c)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2234 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2235 case '%':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2236 case '#':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2237 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2238 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2239 if (! beginning_of_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2240 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2241 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2242 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2243 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2244 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2245 in_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2246 beginning_of_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2247 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2248 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2249
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2250 case '\n':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2251 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2252 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2253 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2254 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2255 comment_buf.resize (0);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2256 in_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2257 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2258 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2259 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2260
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2261 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2262 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2263 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2264 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2265 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2266 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2267 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2268 }
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2269 }
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2270
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2271 if (! comment_buf.empty ())
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2272 octave_comment_buffer::append (comment_buf);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2273 }
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2274
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2275 // Discard whitespace, including comments and continuations.
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
2276 //
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
2277 // Return value is logical OR of the following values:
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
2278 //
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
2279 // ATE_NOTHING : no spaces to eat
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
2280 // ATE_SPACE_OR_TAB : space or tab in input
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
2281 // ATE_NEWLINE : bare new line in input
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2282
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2283 // 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
2284
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
2285 static yum_yum
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2286 eat_whitespace (void)
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2287 {
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
2288 yum_yum retval = ATE_NOTHING;
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2289
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2290 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2291
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2292 bool in_comment = false;
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2293 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2294
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2295 int c = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2296
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
2297 while ((c = text_yyinput ()) != EOF)
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2298 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
2299 lexer_flags.current_input_column++;
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2300
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2301 switch (c)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2302 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2303 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2304 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2305 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2306 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2307 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2308 beginning_of_comment = false;
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 retval |= ATE_SPACE_OR_TAB;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2311 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2312
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2313 case '\n':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2314 retval |= ATE_NEWLINE;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2315 if (in_comment)
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 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2318 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2319 comment_buf.resize (0);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2320 in_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2321 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2322 }
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
2323 lexer_flags.current_input_column = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2324 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2325
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2326 case '#':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2327 case '%':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2328 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2329 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2330 if (! beginning_of_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2331 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2332 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2333 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2334 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2335 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2336 in_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2337 beginning_of_comment = true;
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 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2340
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2341 case '.':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2342 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2343 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2344 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2345 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2346 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2347 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2348 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2349 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2350 if (have_ellipsis_continuation ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2351 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2352 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2353 goto done;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2354 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2355
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2356 case '\\':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2357 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2358 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2359 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2360 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2361 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2362 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2363 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2364 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2365 if (have_continuation ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2366 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2367 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2368 goto done;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2369 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2370
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2371 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2372 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2373 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2374 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2375 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2376 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2377 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2378 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2379 goto done;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2380 }
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2381 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2382
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2383 if (! comment_buf.empty ())
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2384 octave_comment_buffer::append (comment_buf);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2385
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2386 done:
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2387 xunput (c, yytext);
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
2388 lexer_flags.current_input_column--;
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2389 return retval;
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2390 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2391
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2392 static inline bool
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2393 looks_like_hex (const char *s, int len)
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2394 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2395 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
2396 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2397
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
2398 static void
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2399 handle_number (void)
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2400 {
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2401 double value = 0.0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2402 int nread = 0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2403
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2404 if (looks_like_hex (yytext, strlen (yytext)))
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2405 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2406 unsigned long ival;
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2407
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2408 nread = sscanf (yytext, "%lx", &ival);
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2409
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2410 value = static_cast<double> (ival);
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2411 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2412 else
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2413 {
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2414 char *tmp = strsave (yytext);
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2415
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2416 char *idx = strpbrk (tmp, "Dd");
2621
337a09dd1c06 [project @ 1997-01-24 21:49:41 by jwe]
jwe
parents: 2614
diff changeset
2417
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2418 if (idx)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2419 *idx = 'e';
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2420
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2421 nread = sscanf (tmp, "%lf", &value);
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2422
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2423 delete [] tmp;
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2424 }
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2425
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
2426 // 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
2427
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2428 assert (nread == 1);
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2429
3988
9a73d0e7e737 [project @ 2002-07-12 19:25:04 by jwe]
jwe
parents: 3985
diff changeset
2430 lexer_flags.quote_is_transpose = true;
9a73d0e7e737 [project @ 2002-07-12 19:25:04 by jwe]
jwe
parents: 3985
diff changeset
2431 lexer_flags.convert_spaces_to_comma = true;
11217
521373e25613 correctly parse {1 2 {3 4}}
John W. Eaton <jwe@octave.org>
parents: 10426
diff changeset
2432 lexer_flags.looking_for_object_index = false;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2433 lexer_flags.at_beginning_of_statement = false;
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2434
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
2435 yylval.tok_val = new token (value, yytext, lexer_flags.input_line_number,
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
2436 lexer_flags.current_input_column);
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2437
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2438 token_stack.push (yylval.tok_val);
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2439
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
2440 lexer_flags.current_input_column += yyleng;
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2441
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2442 do_comma_insert_check ();
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2443 }
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2444
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2445 // 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
2446 // 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
2447 // and including the new line character.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2448 //
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2449 // 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
2450 // 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
2451 // If non-whitespace characters are found before comment
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2452 // characters, return 0. Otherwise, return 1.
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2453
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2454 // 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
2455
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2456 static bool
3096
ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe]
jwe
parents: 3079
diff changeset
2457 have_continuation (bool trailing_comments_ok)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2458 {
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
2459 std::ostringstream buf;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2460
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2461 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2462
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2463 bool in_comment = false;
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2464 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2465
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2466 int c = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2467
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
2468 while ((c = text_yyinput ()) != EOF)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2469 {
3802
4f1a26a730fd [project @ 2001-02-26 20:26:14 by jwe]
jwe
parents: 3796
diff changeset
2470 buf << static_cast<char> (c);
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2471
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2472 switch (c)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2473 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2474 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2475 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2476 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2477 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2478 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2479 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2480 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2481 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2482
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2483 case '%':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2484 case '#':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2485 if (trailing_comments_ok)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2486 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2487 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2488 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2489 if (! beginning_of_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2490 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2491 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2492 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2493 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2494 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2495 in_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2496 beginning_of_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2497 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2498 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2499 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2500 goto cleanup;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2501 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2502
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2503 case '\n':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2504 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2505 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2506 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2507 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2508 }
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
2509 lexer_flags.current_input_column = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2510 promptflag--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2511 gripe_matlab_incompatible_continuation ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2512 return true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2513
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2514 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2515 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2516 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2517 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2518 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2519 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2520 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2521 goto cleanup;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2522 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2523 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2524 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2525
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2526 xunput (c, yytext);
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2527 return false;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2528
3096
ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe]
jwe
parents: 3079
diff changeset
2529 cleanup:
4051
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe]
jwe
parents: 4037
diff changeset
2530
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
2531 std::string s = buf.str ();
4051
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe]
jwe
parents: 4037
diff changeset
2532
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe]
jwe
parents: 4037
diff changeset
2533 int len = s.length ();
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe]
jwe
parents: 4037
diff changeset
2534 while (len--)
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2535 xunput (s[len], yytext);
3096
ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe]
jwe
parents: 3079
diff changeset
2536
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2537 return false;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2538 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2539
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
2540 // 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
2541 // 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
2542 // line character.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2543
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2544 static bool
3096
ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe]
jwe
parents: 3079
diff changeset
2545 have_ellipsis_continuation (bool trailing_comments_ok)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2546 {
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
2547 char c1 = text_yyinput ();
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2548 if (c1 == '.')
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2549 {
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
2550 char c2 = text_yyinput ();
1091
54abf1b3a8e9 [project @ 1995-02-02 00:30:14 by jwe]
jwe
parents: 1088
diff changeset
2551 if (c2 == '.' && have_continuation (trailing_comments_ok))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2552 return true;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2553 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2554 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2555 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2556 xunput (c1, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2557 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2558 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2559 else
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2560 xunput (c1, yytext);
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2561
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2562 return false;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2563 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2564
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2565 // 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
2566 // whitespace on the next line.
1088
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
2567 //
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe]
jwe
parents: 1082
diff changeset
2568 // Return value is the same as described for eat_whitespace().
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2569
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
2570 static yum_yum
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2571 eat_continuation (void)
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2572 {
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
2573 int retval = ATE_NOTHING;
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2574
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
2575 int c = text_yyinput ();
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2576
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2577 if ((c == '.' && have_ellipsis_continuation ())
3105
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3103
diff changeset
2578 || (c == '\\' && have_continuation ()))
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2579 retval = eat_whitespace ();
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2580 else
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2581 xunput (c, yytext);
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2582
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2583 return retval;
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2584 }
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2585
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2586 static int
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2587 handle_string (char delim)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2588 {
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
2589 std::ostringstream buf;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2590
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
2591 int bos_line = lexer_flags.input_line_number;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
2592 int bos_col = lexer_flags.current_input_column;
3805
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe]
jwe
parents: 3802
diff changeset
2593
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2594 int c;
1031
59f5eb2d5eb3 [project @ 1995-01-15 21:11:11 by jwe]
jwe
parents: 1019
diff changeset
2595 int escape_pending = 0;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2596
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
2597 while ((c = text_yyinput ()) != EOF)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2598 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
2599 lexer_flags.current_input_column++;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2600
3105
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3103
diff changeset
2601 if (c == '\\')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2602 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2603 if (delim == '\'' || escape_pending)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2604 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2605 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2606 escape_pending = 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2607 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2608 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2609 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2610 if (have_continuation (false))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2611 escape_pending = 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2612 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2613 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2614 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2615 escape_pending = 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2616 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2617 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2618 continue;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2619 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2620 else if (c == '.')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2621 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2622 if (delim == '\'' || ! have_ellipsis_continuation (false))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2623 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2624 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2625 else if (c == '\n')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2626 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2627 error ("unterminated string constant");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2628 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2629 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2630 else if (c == delim)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2631 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2632 if (escape_pending)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2633 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2634 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2635 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2636 c = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2637 if (c == delim)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2638 {
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2639 buf << static_cast<char> (c);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2640 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2641 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2642 {
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2643 std::string s;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2644 xunput (c, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2645
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2646 if (delim == '\'')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2647 s = buf.str ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2648 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2649 s = do_string_escapes (buf.str ());
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2650
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2651 lexer_flags.quote_is_transpose = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2652 lexer_flags.convert_spaces_to_comma = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2653
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2654 yylval.tok_val = new token (s, bos_line, bos_col);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2655 token_stack.push (yylval.tok_val);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2656
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2657 if (delim == '"')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2658 gripe_matlab_incompatible ("\" used as string delimiter");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2659 else if (delim == '\'')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2660 gripe_single_quote_string ();
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
2661
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
2662 lexer_flags.looking_for_object_index = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2663 lexer_flags.at_beginning_of_statement = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2664
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2665 return delim == '"' ? DQ_STRING : SQ_STRING;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2666 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2667 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2668 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2669 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2670 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2671 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2672 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2673
1031
59f5eb2d5eb3 [project @ 1995-01-15 21:11:11 by jwe]
jwe
parents: 1019
diff changeset
2674 escape_pending = 0;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2675 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2676
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2677 return LEXICAL_ERROR;
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2678 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2679
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2680 static bool
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2681 next_token_is_assign_op (void)
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2682 {
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2683 bool retval = false;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2684
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
2685 int c0 = text_yyinput ();
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2686
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2687 switch (c0)
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2688 {
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2689 case '=':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2690 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2691 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2692 xunput (c1, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2693 if (c1 != '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2694 retval = true;
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2695 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2696 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2697
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2698 case '+':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2699 case '-':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2700 case '*':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2701 case '/':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2702 case '\\':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2703 case '&':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2704 case '|':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2705 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2706 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2707 xunput (c1, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2708 if (c1 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2709 retval = true;
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2710 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2711 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2712
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2713 case '.':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2714 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2715 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2716 if (match_any (c1, "+-*/\\"))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2717 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2718 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2719 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2720 if (c2 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2721 retval = true;
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 xunput (c1, yytext);
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2724 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2725 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2726
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2727 case '>':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2728 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2729 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2730 if (c1 == '>')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2731 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2732 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2733 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2734 if (c2 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2735 retval = true;
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 xunput (c1, yytext);
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2738 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2739 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2740
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2741 case '<':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2742 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2743 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2744 if (c1 == '<')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2745 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2746 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2747 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2748 if (c2 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2749 retval = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2750 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2751 xunput (c1, yytext);
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 break;
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 default:
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2756 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2757 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2758
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2759 xunput (c0, yytext);
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2760
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2761 return retval;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2762 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2763
4633
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2764 static bool
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2765 next_token_is_index_op (void)
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2766 {
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
2767 int c = text_yyinput ();
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2768 xunput (c, yytext);
4633
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2769 return c == '(' || c == '{';
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2770 }
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2771
4612
d44675070f1a [project @ 2003-11-14 19:49:56 by jwe]
jwe
parents: 4608
diff changeset
2772 static int
d44675070f1a [project @ 2003-11-14 19:49:56 by jwe]
jwe
parents: 4608
diff changeset
2773 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
2774 {
4612
d44675070f1a [project @ 2003-11-14 19:49:56 by jwe]
jwe
parents: 4608
diff changeset
2775 int retval = bracket_type;
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2776
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
2777 if (! nesting_level.none ())
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2778 {
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
2779 nesting_level.remove ();
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2780
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2781 if (bracket_type == ']')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2782 lexer_flags.bracketflag--;
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2783 else if (bracket_type == '}')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2784 lexer_flags.braceflag--;
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2785 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2786 panic_impossible ();
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2787 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2788
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2789 if (lexer_flags.bracketflag == 0 && lexer_flags.braceflag == 0)
4323
0990c9b77109 [project @ 2003-02-14 07:36:26 by jwe]
jwe
parents: 4318
diff changeset
2790 BEGIN (INITIAL);
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2791
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
2792 if (bracket_type == ']'
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
2793 && next_token_is_assign_op ()
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
2794 && ! lexer_flags.looking_at_return_list)
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2795 {
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2796 retval = CLOSE_BRACE;
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2797 }
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2798 else if ((lexer_flags.bracketflag || lexer_flags.braceflag)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2799 && lexer_flags.convert_spaces_to_comma
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2800 && (nesting_level.is_bracket ()
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2801 || (nesting_level.is_brace ()
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2802 && ! lexer_flags.looking_at_object_index.front ())))
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2803 {
4633
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2804 bool index_op = next_token_is_index_op ();
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2805
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2806 // 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
2807 //
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2808 // [x{i}{j}] or [x{i}(j)]
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2809 //
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2810 // but do if we are looking at
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2811 //
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2812 // [x{i} {j}] or [x{i} (j)]
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2813
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe]
jwe
parents: 4613
diff changeset
2814 if (spc_gobbled || ! (bracket_type == '}' && index_op))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2815 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2816 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
2817
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2818 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
2819
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2820 bool sep_op = next_token_is_sep_op ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2821
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2822 if (! (postfix_un_op || bin_op || sep_op))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2823 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2824 maybe_warn_separator_insert (',');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2825
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2826 xunput (',', yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2827 return retval;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2828 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2829 }
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2830 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2831
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2832 lexer_flags.quote_is_transpose = true;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2833 lexer_flags.convert_spaces_to_comma = true;
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2834
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2835 return retval;
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2836 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2837
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2838 static void
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2839 maybe_unput_comma (int spc_gobbled)
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2840 {
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2841 if (nesting_level.is_bracket ()
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2842 || (nesting_level.is_brace ()
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2843 && ! lexer_flags.looking_at_object_index.front ()))
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2844 {
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2845 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
2846
3246
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe]
jwe
parents: 3238
diff changeset
2847 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
2848
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
2849 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
2850 int c2 = text_yyinput ();
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
2851
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2852 xunput (c2, yytext);
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
2853 xunput (c1, yytext);
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
2854
3263
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe]
jwe
parents: 3258
diff changeset
2855 int sep_op = next_token_is_sep_op ();
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
2856
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2857 int dot_op = (c1 == '.'
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2858 && (isalpha (c2) || isspace (c2) || c2 == '_'));
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
2859
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
2860 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
2861 return;
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
2862
3985
fa0ae9105656 [project @ 2002-07-11 04:02:00 by jwe]
jwe
parents: 3974
diff changeset
2863 int index_op = (c1 == '(' || c1 == '{');
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
2864
4476
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2865 // 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
2866 // a comma.
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2867
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2868 if (index_op && ! spc_gobbled)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2869 return;
4476
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2870
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2871 maybe_warn_separator_insert (',');
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe]
jwe
parents: 4426
diff changeset
2872
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
2873 xunput (',', yytext);
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2874 }
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2875 }
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2876
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2877 static bool
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2878 next_token_can_follow_bin_op (void)
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2879 {
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2880 std::stack<char> buf;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2881
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2882 int c = EOF;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2883
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2884 // Skip whitespace in current statement on current line
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2885 while (true)
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2886 {
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2887 c = text_yyinput ();
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2888
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
2889 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
2890
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
2891 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
2892 break;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2893 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2894
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2895 // Restore input.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2896 while (! buf.empty ())
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2897 {
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2898 xunput (buf.top (), yytext);
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2899
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2900 buf.pop ();
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2901 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2902
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2903 return (isalnum (c) || match_any (c, "!\"'(-[_{~"));
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2904 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2905
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2906 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
2907 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
2908 {
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2909 // 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
2910 // 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
2911
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2912 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
2913 || 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
2914 || 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
2915 || 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
2916 || 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
2917 }
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2918
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
2919 static bool
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2920 looks_like_command_arg (void)
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2921 {
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2922 bool retval = true;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2923
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2924 int c0 = text_yyinput ();
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2925
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2926 switch (c0)
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2927 {
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2928 // = ==
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2929 case '=':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2930 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2931 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2932
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2933 if (c1 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2934 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2935 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2936
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2937 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2938 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2939 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2940
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2941 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2942 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2943 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2944 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2945
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2946 xunput (c1, yytext);
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 break;
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 case '(':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2951 case '{':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2952 // Indexing.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2953 retval = false;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2954 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2955
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2956 case '\n':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2957 // EOL.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2958 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2959
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2960 case '\'':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2961 case '"':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2962 // Beginning of a character string.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2963 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2964
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2965 // + - ++ -- += -=
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2966 case '+':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2967 case '-':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2968 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2969 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2970
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2971 switch (c1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2972 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2973 case '\n':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2974 // EOL.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2975 case '+':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2976 case '-':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2977 // Unary ops, spacing doesn't matter.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2978 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2979
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2980 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2981 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2982 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2983 if (next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2984 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2985 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2986 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2987
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2988 case '=':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2989 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2990 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2991
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2992 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2993 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2994 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2995
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2996 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2997 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2998 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2999 }
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 xunput (c1, yytext);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3002 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3003 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3004
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3005 case ':':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3006 case '/':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3007 case '\\':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3008 case '^':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3009 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3010 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3011
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3012 if (! match_any (c1, ",;\n") && (c1 == ' ' || c1 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3013 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3014 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3015
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3016 xunput (c1, yytext);
8746
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 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3019
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3020 // .+ .- ./ .\ .^ .* .**
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3021 case '.':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3022 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3023 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3024
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3025 if (match_any (c1, "+-/\\^*"))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3026 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3027 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3028
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3029 if (c2 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3030 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3031 int c3 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3032
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3033 if (! match_any (c3, ",;\n") && (c3 == ' ' || c3 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3034 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3035 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3036
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3037 xunput (c3, yytext);
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 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
3040 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3041 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3042
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3043 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3044 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3045 else if (! match_any (c1, ",;\n")
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3046 && (! isdigit (c1) && c1 != ' ' && c1 != '\t'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3047 && c1 != '.'))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3048 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3049 // Structure reference. FIXME -- is this a complete check?
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 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3052 }
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 xunput (c1, yytext);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3055 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3056 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3057
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3058 // & && | || * **
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3059 case '&':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3060 case '|':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3061 case '*':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3062 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3063 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3064
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3065 if (c1 == c0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3066 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3067 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3068
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3069 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3070 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3071 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3072
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3073 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3074 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3075 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
3076 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3077 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3078
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3079 xunput (c1, yytext);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3080 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3081 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3082
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3083 // < <= > >=
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3084 case '<':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3085 case '>':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3086 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3087 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3088
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3089 if (c1 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3090 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3091 int c2 = 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 (c2, ",;\n") && (c2 == ' ' || c2 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3094 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3095 retval = false;
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 xunput (c2, yytext);
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 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
3100 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3101 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3102
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3103 xunput (c1, yytext);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3104 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3105 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3106
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3107 // ~= !=
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3108 case '~':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3109 case '!':
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3110 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3111 int c1 = text_yyinput ();
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 // ~ and ! can be unary ops, so require following =.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3114 if (c1 == '=')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3115 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3116 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3117
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3118 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3119 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3120 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3121
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3122 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3123 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3124 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
3125 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3126 retval = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3127
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3128 xunput (c1, yytext);
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3129 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3130 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3131
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3132 default:
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3133 break;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3134 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3135
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3136 xunput (c0, yytext);
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3137
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3138 return retval;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3139 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3140
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3141 static int
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3142 handle_superclass_identifier (void)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3143 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3144 eat_continuation ();
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3145
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3146 std::string pkg;
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3147 std::string meth = strip_trailing_whitespace (yytext);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3148 size_t pos = meth.find ("@");
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3149 std::string cls = meth.substr (pos).substr (1);
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3150 meth = meth.substr (0, pos - 1);
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3151
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3152 pos = cls.find (".");
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3153 if (pos != std::string::npos)
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3154 {
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3155 pkg = cls.substr (pos).substr (1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3156 cls = cls.substr (0, pos - 1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3157 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3158
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3159 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
3160 || is_keyword_token (pkg));
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3161 if (kw_token)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3162 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3163 error ("method, class and package names may not be keywords");
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3164 return LEXICAL_ERROR;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3165 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3166
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3167 yylval.tok_val
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3168 = new token (meth.empty () ? 0 : &(symbol_table::insert (meth)),
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3169 cls.empty () ? 0 : &(symbol_table::insert (cls)),
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3170 pkg.empty () ? 0 : &(symbol_table::insert (pkg)),
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3171 lexer_flags.input_line_number,
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3172 lexer_flags.current_input_column);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3173 token_stack.push (yylval.tok_val);
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3174
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3175 lexer_flags.convert_spaces_to_comma = true;
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3176 lexer_flags.current_input_column += yyleng;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3177
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3178 return SUPERCLASSREF;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3179 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3180
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3181 static int
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3182 handle_meta_identifier (void)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3183 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3184 eat_continuation ();
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3185
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3186 std::string pkg;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3187 std::string cls = strip_trailing_whitespace (yytext).substr (1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3188 size_t pos = cls.find (".");
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3189
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3190 if (pos != std::string::npos)
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3191 {
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3192 pkg = cls.substr (pos).substr (1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3193 cls = cls.substr (0, pos - 1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3194 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3195
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3196 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
3197 if (kw_token)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3198 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3199 error ("class and package names may not be keywords");
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3200 return LEXICAL_ERROR;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3201 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3202
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3203 yylval.tok_val
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3204 = new token (cls.empty () ? 0 : &(symbol_table::insert (cls)),
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3205 pkg.empty () ? 0 : &(symbol_table::insert (pkg)),
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3206 lexer_flags.input_line_number,
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3207 lexer_flags.current_input_column);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3208
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3209 token_stack.push (yylval.tok_val);
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3210
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3211 lexer_flags.convert_spaces_to_comma = true;
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3212 lexer_flags.current_input_column += yyleng;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3213
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3214 return METAQUERY;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3215 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3216
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
3217 // 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
3218 // an identifier. Handles keywords. Return -1 if the identifier
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
3219 // should be ignored.
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
3220
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3221 static int
3974
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3222 handle_identifier (void)
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3223 {
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3224 bool at_bos = lexer_flags.at_beginning_of_statement;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3225
3974
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3226 std::string tok = strip_trailing_whitespace (yytext);
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3227
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3228 int c = yytext[yyleng-1];
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3229
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3230 int cont_is_spc = eat_continuation ();
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3231
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3232 int spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe]
jwe
parents: 3973
diff changeset
3233
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
3234 // If we are expecting a structure element, avoid recognizing
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
3235 // 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
3236 // 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
3237 // decide whether to insert a comma.
747
6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe]
jwe
parents: 661
diff changeset
3238
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
3239 if (lexer_flags.looking_at_indirect_ref)
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
3240 {
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
3241 do_comma_insert_check ();
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
3242
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
3243 maybe_unput_comma (spc_gobbled);
2819
ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe]
jwe
parents: 2804
diff changeset
3244
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3245 yylval.tok_val = new token (tok, lexer_flags.input_line_number,
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3246 lexer_flags.current_input_column);
2819
ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe]
jwe
parents: 2804
diff changeset
3247
ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe]
jwe
parents: 2804
diff changeset
3248 token_stack.push (yylval.tok_val);
ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe]
jwe
parents: 2804
diff changeset
3249
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
3250 lexer_flags.quote_is_transpose = true;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
3251 lexer_flags.convert_spaces_to_comma = true;
9324
29563379fa9b don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents: 8974
diff changeset
3252 lexer_flags.looking_for_object_index = true;
2819
ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe]
jwe
parents: 2804
diff changeset
3253
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3254 lexer_flags.current_input_column += yyleng;
2819
ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe]
jwe
parents: 2804
diff changeset
3255
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
3256 return STRUCT_ELT;
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
3257 }
747
6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe]
jwe
parents: 661
diff changeset
3258
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3259 lexer_flags.at_beginning_of_statement = false;
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3260
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3261 // The is_keyword_token may reset
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3262 // lexer_flags.at_beginning_of_statement. For example, if it sees
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3263 // 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
3264 // statement.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3265
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3266 int kw_token = is_keyword_token (tok);
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3267
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3268 // 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
3269 // 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
3270 // statement.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3271
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3272 if (lexer_flags.looking_at_function_handle)
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3273 {
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3274 if (kw_token)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3275 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3276 error ("function handles may not refer to keywords");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3277
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3278 return LEXICAL_ERROR;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3279 }
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3280 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3281 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3282 yylval.tok_val = new token (tok, lexer_flags.input_line_number,
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3283 lexer_flags.current_input_column);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3284
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3285 token_stack.push (yylval.tok_val);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3286
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3287 lexer_flags.current_input_column += yyleng;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3288 lexer_flags.quote_is_transpose = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3289 lexer_flags.convert_spaces_to_comma = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3290 lexer_flags.looking_for_object_index = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3291
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3292 return FCN_HANDLE;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3293 }
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3294 }
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
3295
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
3296 // 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
3297 // Keywords can be followed by identifiers.
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3298
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3299 if (kw_token)
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3300 {
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3301 if (kw_token >= 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3302 {
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3303 lexer_flags.current_input_column += yyleng;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3304 lexer_flags.quote_is_transpose = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3305 lexer_flags.convert_spaces_to_comma = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3306 lexer_flags.looking_for_object_index = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3307 }
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3308
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3309 return kw_token;
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3310 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3311
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
3312 // 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
3313
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
3314 int c1 = text_yyinput ();
3480
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3315
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3316 bool next_tok_is_eq = false;
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3317 if (c1 == '=')
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3318 {
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
3319 int c2 = text_yyinput ();
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
3320 xunput (c2, yytext);
3480
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3321
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3322 if (c2 != '=')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3323 next_tok_is_eq = true;
3480
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3324 }
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe]
jwe
parents: 3428
diff changeset
3325
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
3326 xunput (c1, yytext);
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
3327
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3328 // Kluge alert.
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3329 //
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3330 // 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
3331 // arguments.
76411ce43c05 [project @ 1997-02-26 07:52:14 by jwe]
jwe
parents: 2716
diff changeset
3332 //
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3333 // 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
3334 // 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
3335 // 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
3336 // as a variable in the current symbol table.
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3337
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3338 if (! is_variable (tok))
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3339 {
10052
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands
John W. Eaton <jwe@octave.org>
parents: 10048
diff changeset
3340 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
3341 && looks_like_command_arg ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3342 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3343 BEGIN (COMMAND_START);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3344 }
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3345 else if (next_tok_is_eq
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3346 || lexer_flags.looking_at_decl_list
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3347 || lexer_flags.looking_at_return_list
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3348 || (lexer_flags.looking_at_parameter_list
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3349 && ! lexer_flags.looking_at_initializer_expression))
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 symbol_table::force_variable (tok);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3352 }
8001
ff9e7873f8ea improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents: 7898
diff changeset
3353 else if (lexer_flags.looking_at_matrix_or_assign_lhs)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3354 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3355 lexer_flags.pending_local_variables.insert (tok);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3356 }
2702
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3357 }
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe]
jwe
parents: 2621
diff changeset
3358
4234
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe]
jwe
parents: 4233
diff changeset
3359 // 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
3360 // transformation of the end keyword...
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe]
jwe
parents: 4233
diff changeset
3361
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe]
jwe
parents: 4233
diff changeset
3362 if (tok == "end")
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3363 tok = "__end__";
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3364
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7017
diff changeset
3365 yylval.tok_val = new token (&(symbol_table::insert (tok)),
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3366 lexer_flags.input_line_number,
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3367 lexer_flags.current_input_column);
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7017
diff changeset
3368
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3369 token_stack.push (yylval.tok_val);
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3370
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
3371 // 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
3372 // (if needed).
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3373
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
3374 lexer_flags.convert_spaces_to_comma = true;
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3375
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3376 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
3377 {
5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe]
jwe
parents: 2861
diff changeset
3378 lexer_flags.quote_is_transpose = true;
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3379
2877
5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe]
jwe
parents: 2861
diff changeset
3380 do_comma_insert_check ();
5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe]
jwe
parents: 2861
diff changeset
3381
5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe]
jwe
parents: 2861
diff changeset
3382 maybe_unput_comma (spc_gobbled);
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3383 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3384
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3385 lexer_flags.current_input_column += yyleng;
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3386
9324
29563379fa9b don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents: 8974
diff changeset
3387 if (tok != "__end__")
29563379fa9b don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents: 8974
diff changeset
3388 lexer_flags.looking_for_object_index = true;
29563379fa9b don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents: 8974
diff changeset
3389
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3390 return NAME;
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3391 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
3392
4867
c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe]
jwe
parents: 4765
diff changeset
3393 bool
c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe]
jwe
parents: 4765
diff changeset
3394 is_keyword (const std::string& s)
c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe]
jwe
parents: 4765
diff changeset
3395 {
14292
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3396 // Parsing function names like "set.property_name" inside
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3397 // classdef-style class definitions is simplified by handling the
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3398 // "set" and "get" portions of the names using the same mechanism as
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3399 // is used for keywords. However, they are not really keywords in
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3400 // the language, so omit them from the list of possible keywords.
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3401
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3402 return (octave_kw_hash::in_word_set (s.c_str (), s.length ()) != 0
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3403 && ! (s == "set" || s == "get"));
4867
c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe]
jwe
parents: 4765
diff changeset
3404 }
c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe]
jwe
parents: 4765
diff changeset
3405
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
3406 DEFUN (iskeyword, args, ,
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3407 "-*- texinfo -*-\n\
11431
0d9640d755b1 Improve docstrings for all isXXX functions.
Rik <octave@nomad.inbox5.com>
parents: 11367
diff changeset
3408 @deftypefn {Built-in Function} {} iskeyword ()\n\
0d9640d755b1 Improve docstrings for all isXXX functions.
Rik <octave@nomad.inbox5.com>
parents: 11367
diff changeset
3409 @deftypefnx {Built-in Function} {} iskeyword (@var{name})\n\
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3410 Return true if @var{name} is an Octave keyword. If @var{name}\n\
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3411 is omitted, return a list of keywords.\n\
11431
0d9640d755b1 Improve docstrings for all isXXX functions.
Rik <octave@nomad.inbox5.com>
parents: 11367
diff changeset
3412 @seealso{isvarname, exist}\n\
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3413 @end deftypefn")
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3414 {
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3415 octave_value retval;
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3416
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3417 int argc = args.length () + 1;
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3418
4867
c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe]
jwe
parents: 4765
diff changeset
3419 string_vector argv = args.make_argv ("iskeyword");
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3420
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3421 if (error_state)
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3422 return retval;
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3423
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3424 if (argc == 1)
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3425 {
14292
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3426 // Neither set and get are keywords. See the note in the
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3427 // is_keyword function for additional details.
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3428
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3429 string_vector lst (TOTAL_KEYWORDS);
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3430
14292
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3431 int j = 0;
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3432
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3433 for (int i = 0; i < TOTAL_KEYWORDS; i++)
14292
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3434 {
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3435 std::string tmp = wordlist[i].name;
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3436
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3437 if (! (tmp == "set" || tmp == "get"))
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3438 lst[j++] = tmp;
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3439 }
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3440
d1810b2ca809 iskeyword: don't consider get and set as keywords
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
3441 lst.resize (j);
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3442
8504
0e0bd07e6ae2 omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents: 8447
diff changeset
3443 retval = Cell (lst.sort ());
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3444 }
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3445 else if (argc == 2)
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3446 {
4867
c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe]
jwe
parents: 4765
diff changeset
3447 retval = is_keyword (argv[1]);
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3448 }
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3449 else
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5794
diff changeset
3450 print_usage ();
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3451
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3452 return retval;
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3453 }
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3454
12801
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll
Rik <octave@nomad.inbox5.com>
parents: 12627
diff changeset
3455 /*
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll
Rik <octave@nomad.inbox5.com>
parents: 12627
diff changeset
3456
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll
Rik <octave@nomad.inbox5.com>
parents: 12627
diff changeset
3457 %!assert (iskeyword ("for"))
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll
Rik <octave@nomad.inbox5.com>
parents: 12627
diff changeset
3458 %!assert (iskeyword ("fort"), false)
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll
Rik <octave@nomad.inbox5.com>
parents: 12627
diff changeset
3459 %!assert (iskeyword ("fft"), false)
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll
Rik <octave@nomad.inbox5.com>
parents: 12627
diff changeset
3460
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll
Rik <octave@nomad.inbox5.com>
parents: 12627
diff changeset
3461 */
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll
Rik <octave@nomad.inbox5.com>
parents: 12627
diff changeset
3462
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
3463 void
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
3464 prep_lexer_for_script_file (void)
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
3465 {
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
3466 BEGIN (SCRIPT_FILE_BEGIN);
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7634
diff changeset
3467 }
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
3468
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
3469 void
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
3470 prep_lexer_for_function_file (void)
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
3471 {
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
3472 BEGIN (FUNCTION_FILE_BEGIN);
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
3473 }
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
3474
16098
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3475 static int
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3476 octave_read (char *buf, unsigned max_size)
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3477 {
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3478 static const char * const eol = "\n";
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3479 static std::string input_buf;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3480 static const char *pos = 0;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3481 static size_t chars_left = 0;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3482 static bool eof = false;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3483
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3484 int status = 0;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3485
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3486 if (chars_left == 0)
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3487 {
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3488 pos = 0;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3489
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3490 input_buf = get_user_input (eof);
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3491
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3492 chars_left = input_buf.length ();
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3493
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3494 pos = input_buf.c_str ();
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3495 }
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3496
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3497 if (chars_left > 0)
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3498 {
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3499 size_t len = max_size > chars_left ? chars_left : max_size;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3500 assert (len > 0);
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3501
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3502 memcpy (buf, pos, len);
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3503
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3504 chars_left -= len;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3505 pos += len;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3506
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3507 // Make sure input ends with a new line character.
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3508 if (chars_left == 0 && buf[len-1] != '\n')
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3509 {
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3510 if (len < max_size)
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3511 {
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3512 // There is enough room to plug the newline character in
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3513 // the buffer.
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3514 buf[len++] = '\n';
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3515 }
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3516 else
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3517 {
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3518 // There isn't enough room to plug the newline character
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3519 // in the buffer so make sure it is returned on the next
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3520 // octave_read call.
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3521 pos = eol;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3522 chars_left = 1;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3523 }
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3524 }
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3525
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3526 status = len;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3527 }
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3528 else
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3529 {
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3530 status = YY_NULL;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3531
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3532 if (! eof)
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3533 YY_FATAL_ERROR ("octave_read () in flex scanner failed");
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3534 }
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3535
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3536 return status;
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3537 }
24b3800d30e7 move octave_read to lex.ll
John W. Eaton <jwe@octave.org>
parents: 15468
diff changeset
3538
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
3539 static void
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
3540 maybe_warn_separator_insert (char sep)
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
3541 {
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
3542 std::string nm = curr_fcn_file_full_name;
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
3543
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3544 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3545 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
3546 "potential auto-insertion of '%c' near line %d",
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3547 sep, lexer_flags.input_line_number);
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3548 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3549 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
3550 "potential auto-insertion of '%c' near line %d of file %s",
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3551 sep, lexer_flags.input_line_number, nm.c_str ());
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
3552 }
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
3553
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
3554 static void
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
3555 gripe_single_quote_string (void)
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
3556 {
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
3557 std::string nm = curr_fcn_file_full_name;
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
3558
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3559 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3560 warning_with_id ("Octave:single-quote-string",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3561 "single quote delimited string near line %d",
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3562 lexer_flags.input_line_number);
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3563 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
3564 warning_with_id ("Octave:single-quote-string",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3565 "single quote delimited string near line %d of file %s",
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3566 lexer_flags.input_line_number, nm.c_str ());
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
3567 }
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
3568
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3569 static void
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3570 gripe_matlab_incompatible (const std::string& msg)
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3571 {
8974
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
3572 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
3573
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
3574 if (nm.empty ())
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
3575 warning_with_id ("Octave:matlab-incompatible",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3576 "potential Matlab compatibility problem: %s",
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3577 msg.c_str ());
8974
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
3578 else
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
3579 warning_with_id ("Octave:matlab-incompatible",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3580 "potential Matlab compatibility problem: %s near line %d offile %s",
16103
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16102
diff changeset
3581 msg.c_str (), lexer_flags.input_line_number, nm.c_str ());
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3582 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3583
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3584 static void
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3585 maybe_gripe_matlab_incompatible_comment (char c)
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3586 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3587 if (c == '#')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3588 gripe_matlab_incompatible ("# used as comment character");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3589 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3590
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3591 static void
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3592 gripe_matlab_incompatible_continuation (void)
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3593 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3594 gripe_matlab_incompatible ("\\ used as line continuation marker");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3595 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3596
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3597 static void
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3598 gripe_matlab_incompatible_operator (const std::string& op)
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3599 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3600 std::string t = op;
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3601 int n = t.length ();
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3602 if (t[n-1] == '\n')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3603 t.resize (n-1);
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3604 gripe_matlab_incompatible (t + " used as operator");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3605 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
3606
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3607 static void
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3608 display_token (int tok)
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3609 {
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3610 switch (tok)
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3611 {
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3612 case '=': std::cerr << "'='\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3613 case ':': std::cerr << "':'\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3614 case '-': std::cerr << "'-'\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3615 case '+': std::cerr << "'+'\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3616 case '*': std::cerr << "'*'\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3617 case '/': std::cerr << "'/'\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3618 case ADD_EQ: std::cerr << "ADD_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3619 case SUB_EQ: std::cerr << "SUB_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3620 case MUL_EQ: std::cerr << "MUL_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3621 case DIV_EQ: std::cerr << "DIV_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3622 case LEFTDIV_EQ: std::cerr << "LEFTDIV_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3623 case POW_EQ: std::cerr << "POW_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3624 case EMUL_EQ: std::cerr << "EMUL_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3625 case EDIV_EQ: std::cerr << "EDIV_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3626 case ELEFTDIV_EQ: std::cerr << "ELEFTDIV_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3627 case EPOW_EQ: std::cerr << "EPOW_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3628 case AND_EQ: std::cerr << "AND_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3629 case OR_EQ: std::cerr << "OR_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3630 case LSHIFT_EQ: std::cerr << "LSHIFT_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3631 case RSHIFT_EQ: std::cerr << "RSHIFT_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3632 case LSHIFT: std::cerr << "LSHIFT\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3633 case RSHIFT: std::cerr << "RSHIFT\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3634 case EXPR_AND_AND: std::cerr << "EXPR_AND_AND\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3635 case EXPR_OR_OR: std::cerr << "EXPR_OR_OR\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3636 case EXPR_AND: std::cerr << "EXPR_AND\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3637 case EXPR_OR: std::cerr << "EXPR_OR\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3638 case EXPR_NOT: std::cerr << "EXPR_NOT\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3639 case EXPR_LT: std::cerr << "EXPR_LT\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3640 case EXPR_LE: std::cerr << "EXPR_LE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3641 case EXPR_EQ: std::cerr << "EXPR_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3642 case EXPR_NE: std::cerr << "EXPR_NE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3643 case EXPR_GE: std::cerr << "EXPR_GE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3644 case EXPR_GT: std::cerr << "EXPR_GT\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3645 case LEFTDIV: std::cerr << "LEFTDIV\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3646 case EMUL: std::cerr << "EMUL\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3647 case EDIV: std::cerr << "EDIV\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3648 case ELEFTDIV: std::cerr << "ELEFTDIV\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3649 case EPLUS: std::cerr << "EPLUS\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3650 case EMINUS: std::cerr << "EMINUS\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3651 case QUOTE: std::cerr << "QUOTE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3652 case TRANSPOSE: std::cerr << "TRANSPOSE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3653 case PLUS_PLUS: std::cerr << "PLUS_PLUS\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3654 case MINUS_MINUS: std::cerr << "MINUS_MINUS\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3655 case POW: std::cerr << "POW\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3656 case EPOW: std::cerr << "EPOW\n"; break;
11466
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3657
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3658 case NUM:
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3659 case IMAG_NUM:
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3660 std::cerr << (tok == NUM ? "NUM" : "IMAG_NUM")
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3661 << " [" << yylval.tok_val->number () << "]\n";
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3662 break;
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3663
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3664 case STRUCT_ELT:
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3665 std::cerr << "STRUCT_ELT [" << yylval.tok_val->text () << "]\n"; break;
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3666
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3667 case NAME:
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3668 {
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3669 symbol_table::symbol_record *sr = yylval.tok_val->sym_rec ();
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3670 std::cerr << "NAME";
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3671 if (sr)
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3672 std::cerr << " [" << sr->name () << "]";
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3673 std::cerr << "\n";
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3674 }
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3675 break;
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3676
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3677 case END: std::cerr << "END\n"; break;
11466
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3678
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3679 case DQ_STRING:
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3680 case SQ_STRING:
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3681 std::cerr << (tok == DQ_STRING ? "DQ_STRING" : "SQ_STRING")
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3682 << " [" << yylval.tok_val->text () << "]\n";
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3683 break;
1f64a7b73e98 lex.ll (display_tokens): print token values
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
3684
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3685 case FOR: std::cerr << "FOR\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3686 case WHILE: std::cerr << "WHILE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3687 case DO: std::cerr << "DO\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3688 case UNTIL: std::cerr << "UNTIL\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3689 case IF: std::cerr << "IF\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3690 case ELSEIF: std::cerr << "ELSEIF\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3691 case ELSE: std::cerr << "ELSE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3692 case SWITCH: std::cerr << "SWITCH\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3693 case CASE: std::cerr << "CASE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3694 case OTHERWISE: std::cerr << "OTHERWISE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3695 case BREAK: std::cerr << "BREAK\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3696 case CONTINUE: std::cerr << "CONTINUE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3697 case FUNC_RET: std::cerr << "FUNC_RET\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3698 case UNWIND: std::cerr << "UNWIND\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3699 case CLEANUP: std::cerr << "CLEANUP\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3700 case TRY: std::cerr << "TRY\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3701 case CATCH: std::cerr << "CATCH\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3702 case GLOBAL: std::cerr << "GLOBAL\n"; break;
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
3703 case PERSISTENT: std::cerr << "PERSISTENT\n"; break;
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3704 case FCN_HANDLE: std::cerr << "FCN_HANDLE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3705 case END_OF_INPUT: std::cerr << "END_OF_INPUT\n\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3706 case LEXICAL_ERROR: std::cerr << "LEXICAL_ERROR\n\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3707 case FCN: std::cerr << "FCN\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3708 case CLOSE_BRACE: std::cerr << "CLOSE_BRACE\n"; break;
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
3709 case SCRIPT_FILE: std::cerr << "SCRIPT_FILE\n"; break;
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
3710 case FUNCTION_FILE: std::cerr << "FUNCTION_FILE\n"; break;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3711 case SUPERCLASSREF: std::cerr << "SUPERCLASSREF\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3712 case METAQUERY: std::cerr << "METAQUERY\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3713 case GET: std::cerr << "GET\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3714 case SET: std::cerr << "SET\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3715 case PROPERTIES: std::cerr << "PROPERTIES\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3716 case METHODS: std::cerr << "METHODS\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3717 case EVENTS: std::cerr << "EVENTS\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
3718 case CLASSDEF: std::cerr << "CLASSDEF\n"; break;
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3719 case '\n': std::cerr << "\\n\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3720 case '\r': std::cerr << "\\r\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3721 case '\t': std::cerr << "TAB\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3722 default:
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3723 {
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3724 if (tok < 256)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3725 std::cerr << static_cast<char> (tok) << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3726 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3727 std::cerr << "UNKNOWN(" << tok << ")\n";
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3728 }
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3729 break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3730 }
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3731 }
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3732
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3733 static void
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3734 display_state (void)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3735 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3736 std::cerr << "S: ";
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3737
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3738 switch (YY_START)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3739 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3740 case INITIAL:
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3741 std::cerr << "INITIAL" << std::endl;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3742 break;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3743
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3744 case COMMAND_START:
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3745 std::cerr << "COMMAND_START" << std::endl;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3746 break;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3747
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3748 case MATRIX_START:
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3749 std::cerr << "MATRIX_START" << std::endl;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3750 break;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3751
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3752 case SCRIPT_FILE_BEGIN:
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3753 std::cerr << "SCRIPT_FILE_BEGIN" << std::endl;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3754 break;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3755
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
3756 case FUNCTION_FILE_BEGIN:
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
3757 std::cerr << "FUNCTION_FILE_BEGIN" << std::endl;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3758 break;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3759
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3760 default:
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3761 std::cerr << "UNKNOWN START STATE!" << std::endl;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3762 break;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3763 }
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3764 }
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3765
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3766 static void
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3767 lexer_debug (const char *pattern, const char *text)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3768 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3769 std::cerr << std::endl;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3770
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3771 display_state ();
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3772
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3773 std::cerr << "P: " << pattern << std::endl;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3774 std::cerr << "T: " << text << std::endl;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3775 }
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3776
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3777 DEFUN (__display_tokens__, args, nargout,
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3778 "-*- texinfo -*-\n\
8812
7d48766c21a5 use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents: 8767
diff changeset
3779 @deftypefn {Built-in Function} {} __display_tokens__ ()\n\
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3780 Query or set the internal variable that determines whether Octave's\n\
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3781 lexer displays tokens as they are read.\n\
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3782 @end deftypefn")
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3783 {
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3784 return SET_INTERNAL_VARIABLE (display_tokens);
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3785 }
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
3786
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
3787 DEFUN (__token_count__, , ,
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
3788 "-*- texinfo -*-\n\
8812
7d48766c21a5 use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents: 8767
diff changeset
3789 @deftypefn {Built-in Function} {} __token_count__ ()\n\
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
3790 Number of language tokens processed since Octave startup.\n\
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
3791 @end deftypefn")
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
3792 {
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
3793 return octave_value (Vtoken_count);
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
3794 }
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
3795
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3796 DEFUN (__lexer_debug_flag__, args, nargout,
8812
7d48766c21a5 use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents: 8767
diff changeset
3797 "-*- texinfo -*-\n\
7d48766c21a5 use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents: 8767
diff changeset
3798 @deftypefn {Built-in Function} {@var{old_val} =} __lexer_debug_flag__ (@var{new_val}))\n\
7d48766c21a5 use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents: 8767
diff changeset
3799 Undocumented internal function.\n\
7d48766c21a5 use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents: 8767
diff changeset
3800 @end deftypefn")
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3801 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3802 octave_value retval;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3803
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3804 retval = set_internal_variable (lexer_debug_flag, args, nargout,
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
3805 "__lexer_debug_flag__");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3806
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3807 return retval;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
3808 }