Mercurial > octave-nkf

annotate libinterp/parse-tree/lex.ll @ 16299:c40a8873c2e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate some unused variables * lex.ll (\], \}, \", "'"): Eliminate unused variables. * pt-array-list.cc (tree_array_list::dup): Omit unused argument names from function definition.
author John W. Eaton <jwe@octave.org>
date Wed, 13 Mar 2013 15:40:03 -0400
parents 0925d1f6875e
children e608de76742c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1994
c2d20f365b84 [project @ 1996-03-03 01:19:32 by jwe]
jwe
parents: 1884
diff changeset
1 /*
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 14074
diff changeset
3 Copyright (C) 1993-2012 John W. Eaton
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
4
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
5 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
6
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6547
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6547
diff changeset
10 option) any later version.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
11
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
15 for more details.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
16
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6547
diff changeset
18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6547
diff changeset
19 <http://www.gnu.org/licenses/>.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
20
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
21 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
22
16150
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
23 /*
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
24 We are using the pure parser interface and the reentrant lexer
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
25 interface but the Octave parser and lexer are NOT properly
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
26 reentrant because both still use many global variables. It should be
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
27 safe to create a parser object and call it while anotehr parser
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
28 object is active (to parse a callback function while the main
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
29 interactive parser is waiting for input, for example) if you take
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
30 care to properly save and restore (typically with an unwind_protect
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
31 object) relevant global values before and after the nested call.
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
32 */
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
33
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
34 %option prefix = "octave_"
16146
b6050fc0a2d9 use %option noyywrap
John W. Eaton <jwe@octave.org>
parents: 16139
diff changeset
35 %option noyywrap
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
36 %option reentrant
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
37 %option bison-bridge
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
38
10019
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
39 %top {
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
40 #ifdef HAVE_CONFIG_H
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
41 #include <config.h>
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
42 #endif
10411
479cc8a0a846 use gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
43
10019
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
44 }
7ad32bf759c3 lex.cc: Use %top block to include config.h
John W. Eaton <jwe@octave.org>
parents: 9794
diff changeset
45
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
46 %s COMMAND_START
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
47 %s MATRIX_START
4240
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
48
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
49 %x INPUT_FILE_START
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
50
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
51 %x BLOCK_COMMENT_START
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
52 %x LINE_COMMENT_START
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
53
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
54 %{
240
a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe]
jwe
parents: 216
diff changeset
55
1341
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe]
jwe
parents: 1315
diff changeset
56 #include <cctype>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe]
jwe
parents: 1315
diff changeset
57 #include <cstring>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe]
jwe
parents: 1315
diff changeset
58
8950
d865363208d6 include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
59 #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
60 #include <set>
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
61 #include <sstream>
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
62 #include <string>
4214
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
63 #include <stack>
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
64
4093
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe]
jwe
parents: 4064
diff changeset
65 #include <sys/types.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe]
jwe
parents: 4064
diff changeset
66 #include <unistd.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe]
jwe
parents: 4064
diff changeset
67
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2900
diff changeset
68 #include "cmd-edit.h"
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4131
diff changeset
69 #include "quit.h"
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
70 #include "lo-mappers.h"
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2900
diff changeset
71
16154
aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment.
John W. Eaton <jwe@octave.org>
parents: 16150
diff changeset
72 // These would be alphabetical, but oct-parse.h must be included before
aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment.
John W. Eaton <jwe@octave.org>
parents: 16150
diff changeset
73 // oct-gperf.h and oct-parse.h must be included after token.h and the tree
aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment.
John W. Eaton <jwe@octave.org>
parents: 16150
diff changeset
74 // class declarations. We can't include oct-parse.h in oct-gperf.h
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
75 // 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
76 // times.
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
77
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
78 #include "Cell.h"
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
79 #include "comment-list.h"
2181
138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe]
jwe
parents: 2167
diff changeset
80 #include "defun.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
81 #include "error.h"
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
82 #include "gripes.h"
1351
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1341
diff changeset
83 #include "input.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
84 #include "lex.h"
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
85 #include "ov.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
86 #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
87 #include "parse-private.h"
2987
ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe]
jwe
parents: 2982
diff changeset
88 #include "pt-all.h"
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
89 #include "symtab.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
90 #include "token.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
91 #include "toplev.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
92 #include "utils.h"
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
93 #include "variables.h"
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents: 9476
diff changeset
94 #include <oct-parse.h>
2492
06595bc7f2d0 [project @ 1996-11-09 00:13:50 by jwe]
jwe
parents: 2375
diff changeset
95 #include <oct-gperf.h>
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
96
10426
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
97 #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
98 // 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
99 // 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
100 // 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
101 #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
102 #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
103 #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
104 #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
105 #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
106 #endif
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10411
diff changeset
107
2716
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
108 #if ! (defined (FLEX_SCANNER) \
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
109 && 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
110 && 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
111 #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
112 #endif
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
113
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
114 #define YY_EXTRA_TYPE octave_base_lexer *
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
115 #define curr_lexer yyextra
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
116
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
117 // Arrange to get input via readline.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
118
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
119 #ifdef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
120 #undef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
121 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
122 #define YY_INPUT(buf, result, max_size) \
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
123 result = curr_lexer->fill_flex_buffer (buf, max_size)
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
124
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
125 // 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
126
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
127 #ifdef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
128 #undef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
129 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
130 #define YY_FATAL_ERROR(msg) \
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
131 (yyget_extra (yyscanner))->fatal_error (msg)
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
132
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
133 #define CMD_OR_OP(PATTERN, TOK, COMPAT) \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
134 \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
135 do \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
136 { \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
137 curr_lexer->lexer_debug (PATTERN); \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
138 \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
139 if (curr_lexer->looks_like_command_arg ()) \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
140 { \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
141 yyless (0); \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
142 curr_lexer->push_start_state (COMMAND_START); \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
143 } \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
144 else \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
145 { \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
146 return curr_lexer->handle_op_internal (TOK, false, COMPAT); \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
147 } \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
148 } \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
149 while (0)
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
150
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
151 #define CMD_OR_UNARY_OP(PATTERN, TOK, COMPAT) \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
152 \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
153 do \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
154 { \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
155 curr_lexer->lexer_debug (PATTERN); \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
156 \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
157 if (curr_lexer->looks_like_command_arg ()) \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
158 { \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
159 yyless (0); \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
160 curr_lexer->push_start_state (COMMAND_START); \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
161 } \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
162 else \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
163 { \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
164 int tok \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
165 = (COMPAT \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
166 ? curr_lexer->handle_unary_op (TOK) \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
167 : curr_lexer->handle_incompatible_unary_op (TOK)); \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
168 \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
169 if (tok < 0) \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
170 { \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
171 yyless (0); \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
172 curr_lexer->xunput (','); \
16281
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
173 /* Adjust for comma that was not really in the input stream. */ \
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
174 curr_lexer->current_input_column--; \
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
175 } \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
176 else \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
177 { \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
178 return tok; \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
179 } \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
180 } \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
181 } \
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
182 while (0)
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
183
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
184 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
185
4910
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
186 static unsigned int Vtoken_count = 0;
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe]
jwe
parents: 4867
diff changeset
187
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
188 // Internal variable for lexer debugging state.
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
189 static bool lexer_debug_flag = false;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
190
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
191 // Forward declarations for functions defined at the bottom of this
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
192 // file that are needed inside the lexer actions.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
193
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
194 static std::string strip_trailing_whitespace (char *s);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
195
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
196 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
197
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
198 D [0-9]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
199 S [ \t]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
200 NL ((\n)|(\r)|(\r\n))
16261
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
201 CONT ((\.\.\.)|(\\))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
202 Im [iIjJ]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
203 CCHAR [#%]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
204 IDENT ([_$a-zA-Z][_$a-zA-Z0-9]*)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
205 EXPON ([DdEe][+-]?{D}+)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
206 NUMBER (({D}+\.?{D}*{EXPON}?)|(\.{D}+{EXPON}?)|(0[xX][0-9a-fA-F]+))
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
207
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
208 ANY_INCLUDING_NL (.|{NL})
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
209
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
210 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
211
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
212 %{
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
213 // 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
214 // the parser go down a special path.
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
215 %}
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
216
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
217 <INPUT_FILE_START>{ANY_INCLUDING_NL} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
218 curr_lexer->lexer_debug ("<INPUT_FILE_START>{ANY_INCLUDING_NL}");
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
219
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
220 curr_lexer->xunput (yytext[0]);
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
221
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
222 // May be reset later if we see "function" or "classdef" appears
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
223 // as the first token.
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
224 curr_lexer->reading_script_file = true;
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
225
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
226 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
227
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
228 return curr_lexer->show_token (INPUT_FILE);
4238
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
229 }
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
230
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
231 %{
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
232 // Help and other command-style functions.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
233 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
234
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
235 <COMMAND_START>{NL} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
236 curr_lexer->lexer_debug ("<COMMAND_START>{NL}");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
237
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
238 curr_lexer->input_line_number++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
239 curr_lexer->current_input_column = 1;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
240
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
241 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
242 curr_lexer->at_beginning_of_statement = true;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
243
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
244 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
245
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
246 return curr_lexer->count_token ('\n');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
247 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
248
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
249 <COMMAND_START>[\;\,] {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
250 curr_lexer->lexer_debug ("<COMMAND_START>[\\;\\,]");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
251
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
252 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
253 curr_lexer->at_beginning_of_statement = true;
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
254
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
255 curr_lexer->pop_start_state ();
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
256
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
257 if (strcmp (yytext, ",") == 0)
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
258 return curr_lexer->handle_token (',');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
259 else
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
260 return curr_lexer->handle_token (';');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
261 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
262
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
263 <COMMAND_START>[\"\'] {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
264 curr_lexer->lexer_debug ("<COMMAND_START>[\\\"\\']");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
265
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
266 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
267
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
268 curr_lexer->current_input_column++;
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
269 int tok = curr_lexer->handle_string (yytext[0]);
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
270
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
271 return curr_lexer->count_token_internal (tok);
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
272 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
273
4923
b11223097ad4 [project @ 2004-08-02 16:33:11 by jwe]
jwe
parents: 4910
diff changeset
274 <COMMAND_START>[^#% \t\r\n\;\,\"\'][^ \t\r\n\;\,]*{S}* {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
275 curr_lexer->lexer_debug ("<COMMAND_START>[^#% \\t\\r\\n\\;\\,\\\"\\'][^ \\t\\r\\n\\;\\,]*{S}*");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
276
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
277 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
278
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
279 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
280 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
281
16231
2b15ae55c721 put all tokens in the token cache
John W. Eaton <jwe@octave.org>
parents: 16230
diff changeset
282 return curr_lexer->handle_token (tok, SQ_STRING);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
283 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
284
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
285 <MATRIX_START>{S}* {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
286 curr_lexer->lexer_debug ("<MATRIX_START>{S}*");
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
287
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
288 curr_lexer->mark_previous_token_trailing_space ();
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
289 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
290
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
291 <MATRIX_START>{NL} {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
292 curr_lexer->lexer_debug ("<MATRIX_START>{NL}");
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
293
16281
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
294 curr_lexer->input_line_number++;
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
295 curr_lexer->current_input_column = 1;
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
296
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
297 if (curr_lexer->nesting_level.is_paren ())
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
298 curr_lexer->gripe_matlab_incompatible ("bare newline inside parentheses");
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
299 else
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
300 {
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
301 int tok = curr_lexer->previous_token_value ();
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
302
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
303 if (! (tok == ';' || tok == '[' || tok == '{'))
16281
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
304 {
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
305 curr_lexer->xunput (';');
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
306 // Adjust for semicolon that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
307 curr_lexer->current_input_column--;
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
308 }
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
309 }
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
310 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
311
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
312 %{
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
313 // 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
314 // need to know if the next token is '=' or '=='.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
315 //
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
316 // 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
317 // 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
318 // operator.
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
319 //
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
320 // 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
321 // after seeing a ']' character...
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
322
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
323 // FIXME -- we need to handle block comments here.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
324 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
325
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
326 <MATRIX_START>\] {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
327 curr_lexer->lexer_debug ("<MATRIX_START>\\]");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
328
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
329 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
330
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
331 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
332 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
333
16299
c40a8873c2e7 eliminate some unused variables
John W. Eaton <jwe@octave.org>
parents: 16294
diff changeset
334 curr_lexer->handle_close_bracket (']');
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
335
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
336 return curr_lexer->count_token (']');
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
337 }
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
338
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
339 %{
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
340 // 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
341 %}
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
342
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
343 <MATRIX_START>\} {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
344 curr_lexer->lexer_debug ("<MATRIX_START>\\}*");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
345
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
346 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
347
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
348 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
349 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
350
16299
c40a8873c2e7 eliminate some unused variables
John W. Eaton <jwe@octave.org>
parents: 16294
diff changeset
351 curr_lexer->handle_close_bracket ('}');
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
352
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
353 return curr_lexer->count_token ('}');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
354 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
355
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
356 \[ {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
357 curr_lexer->lexer_debug ("\\[");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
358
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
359 bool unput_comma = false;
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
360
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
361 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
362 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
363 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
364 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
365
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
366 if (! (tok == '[' || tok == '{'
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
367 || curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
368 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
369 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
370
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
371 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
372 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
373 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
374 curr_lexer->xunput (',');
16281
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
375 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
376 curr_lexer->current_input_column--;
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
377 }
5615
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5570
diff changeset
378 else
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
379 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
380 curr_lexer->nesting_level.bracket ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
381
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
382 curr_lexer->looking_at_object_index.push_front (false);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
383
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
384 curr_lexer->current_input_column += yyleng;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
385 curr_lexer->looking_for_object_index = false;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
386 curr_lexer->at_beginning_of_statement = false;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
387
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
388 if (curr_lexer->defining_func
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
389 && ! curr_lexer->parsed_function_name.top ())
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
390 curr_lexer->looking_at_return_list = true;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
391 else
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
392 curr_lexer->looking_at_matrix_or_assign_lhs = true;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
393
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
394 curr_lexer->decrement_promptflag ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
395
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
396 curr_lexer->bracketflag++;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
397
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
398 curr_lexer->push_start_state (MATRIX_START);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
399
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
400 return curr_lexer->count_token ('[');
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
401 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
402 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
403
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
404 \] {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
405 curr_lexer->lexer_debug ("\\]");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
406
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
407 curr_lexer->nesting_level.remove ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
408
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
409 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
410
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
411 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
412 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
413
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
414 return curr_lexer->handle_token (']');
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
415 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
416
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
417 %{
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
418 // Gobble comments.
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
419 %}
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
420
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
421 %{
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
422 // Start of a block comment. If the comment marker appears immediately
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
423 // after a block of full-line comments, finish the full line comment
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
424 // block.
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
425 %}
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
426
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
427 ^{S}*{CCHAR}\{{S}*{NL} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
428 curr_lexer->lexer_debug ("^{S}*{CCHAR}\{{S}*{NL}");
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
429
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
430 yyless (0);
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
431
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
432 if (curr_lexer->start_state () == LINE_COMMENT_START)
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
433 {
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
434 if (! curr_lexer->comment_text.empty ())
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
435 curr_lexer->finish_comment (octave_comment_elt::full_line);
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
436
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
437 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
438 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
439
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
440 curr_lexer->push_start_state (BLOCK_COMMENT_START);
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
441
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
442 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
443
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
444 <BLOCK_COMMENT_START>^{S}*{CCHAR}\{{S}*{NL} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
445 curr_lexer->lexer_debug ("<BLOCK_COMMENT_START>^{S}*{CCHAR}\{{S}*{NL}");
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
446
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
447 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
448 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
449
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
450 if (curr_lexer->block_comment_nesting_level)
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
451 curr_lexer->comment_text = "\n";
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
452
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
453 curr_lexer->block_comment_nesting_level++;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
454 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
455
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
456 %{
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
457 // End of a block comment. If this block comment is nested inside
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
458 // another, wait for the outermost block comment block to be closed
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
459 // before storing the comment.
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
460 %}
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
461
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
462 <BLOCK_COMMENT_START>^{S}*{CCHAR}\}{S}*{NL} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
463 curr_lexer->lexer_debug ("<BLOCK_COMMENT_START>^{S}*{CCHAR}\\}{S}*{NL}");
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
464
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
465 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
466 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
467
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
468 if (curr_lexer->block_comment_nesting_level > 1)
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
469 curr_lexer->comment_text = "\n";
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
470 else
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
471 curr_lexer->finish_comment (octave_comment_elt::block);
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
472
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
473 curr_lexer->block_comment_nesting_level--;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
474 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
475 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
476
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
477 %{
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
478 // Body of a block comment.
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
479 %}
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
480
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
481 <BLOCK_COMMENT_START>.*{NL} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
482 curr_lexer->lexer_debug ("<BLOCK_COMMENT_START>.*{NL}");
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
483
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
484 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
485 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
486 curr_lexer->comment_text += yytext;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
487 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
488
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
489 %{
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
490 // Full-line or end-of-line comment.
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
491 %}
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
492
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
493 {S}*{CCHAR}.*{NL} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
494 curr_lexer->lexer_debug ("{S}*{CCHAR}.*{NL}");
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
495
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
496 curr_lexer->push_start_state (LINE_COMMENT_START);
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
497 yyless (0);
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
498 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
499
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
500 <LINE_COMMENT_START>{S}*{CCHAR}.*{NL} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
501 curr_lexer->lexer_debug ("<LINE_COMMENT_START>{S}*{CCHAR}.*{NL}");
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
502
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
503 bool full_line_comment = curr_lexer->current_input_column == 1;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
504 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
505 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
506
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
507 bool have_space = false;
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
508 size_t len = yyleng;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
509 size_t i = 0;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
510 while (i < len)
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
511 {
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
512 char c = yytext[i];
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
513 if (c == ' ' || c == '\t')
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
514 {
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
515 have_space = true;
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
516 i++;
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
517 }
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
518 else
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
519 break;
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
520 }
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
521
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
522 while (i < len)
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
523 {
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
524 char c = yytext[i];
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
525 if (c == '#' || c == '%')
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
526 i++;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
527 else
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
528 break;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
529 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
530
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
531 curr_lexer->comment_text += &yytext[i];
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
532
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
533 if (! full_line_comment)
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
534 {
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
535 if (have_space)
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
536 curr_lexer->mark_previous_token_trailing_space ();
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
537
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
538 curr_lexer->finish_comment (octave_comment_elt::end_of_line);
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
539
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
540 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
541 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
542 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
543
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
544 %{
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
545 // End of a block of full-line comments.
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
546 %}
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
547
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
548 <LINE_COMMENT_START>{ANY_INCLUDING_NL} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
549 curr_lexer->lexer_debug ("<LINE_COMMENT_START>{ANY_INCLUDING_NL}");
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
550
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
551 curr_lexer->xunput (yytext[0]);
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
552
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
553 curr_lexer->finish_comment (octave_comment_elt::full_line);
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
554
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
555 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
556 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
557
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
558 %{
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
559 // Imaginary numbers.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
560 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
561
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
562 {NUMBER}{Im} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
563 curr_lexer->lexer_debug ("{NUMBER}{Im}");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
564
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
565 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
566
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
567 if (curr_lexer->whitespace_is_significant ()
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
568 && curr_lexer->space_follows_previous_token ()
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
569 && ! (tok == '[' || tok == '{'
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
570 || curr_lexer->previous_token_is_binop ()))
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
571 {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
572 yyless (0);
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
573 unput (',');
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
574 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
575 else
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
576 {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
577 curr_lexer->handle_number ();
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
578 return curr_lexer->count_token_internal (IMAG_NUM);
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
579 }
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
580 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
581
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
582 %{
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
583 // Real numbers. Don't grab the '.' part of a dot operator as part of
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
584 // the constant.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
585 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
586
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
587 {D}+/\.[\*/\\^\'] |
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
588 {NUMBER} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
589 curr_lexer->lexer_debug ("{D}+/\\.[\\*/\\^\\']|{NUMBER}");
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
590
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
591 int tok = curr_lexer->previous_token_value ();
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
592
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
593 if (curr_lexer->whitespace_is_significant ()
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
594 && curr_lexer->space_follows_previous_token ()
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
595 && ! (tok == '[' || tok == '{'
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
596 || curr_lexer->previous_token_is_binop ()))
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
597 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
598 yyless (0);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
599 unput (',');
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
600 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
601 else
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
602 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
603 curr_lexer->handle_number ();
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
604 return curr_lexer->count_token_internal (NUM);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
605 }
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
606 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
607
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
608 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
609 // 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
610 // the <MATRIX_START> start state code above.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
611 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
612
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
613 {S}* {
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
614 curr_lexer->current_input_column += yyleng;
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
615
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
616 curr_lexer->mark_previous_token_trailing_space ();
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
617 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
618
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
619 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
620 // Continuation lines. Allow comments after continuations.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
621 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
622
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
623 {CONT}{S}*{NL} |
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
624 {CONT}{S}*{CCHAR}.*{NL} {
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
625 curr_lexer->lexer_debug ("{CONT}{S}*{NL}|{CONT}{S}*{CCHAR}.*{NL}");
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
626
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
627 curr_lexer->handle_continuation ();
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
628 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
629
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
630 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
631 // End of file.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
632 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
633
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
634 <<EOF>> {
16164
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
635 return curr_lexer->handle_end_of_input ();
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
636 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
637
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
638 %{
16259
0b5ab09dfce4 2/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
639 // Identifiers.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
640 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
641
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
642 {IDENT} {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
643 curr_lexer->lexer_debug ("{IDENT}");
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
644
16259
0b5ab09dfce4 2/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
645 int tok = curr_lexer->previous_token_value ();
0b5ab09dfce4 2/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
646
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
647 if (curr_lexer->whitespace_is_significant ()
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
648 && curr_lexer->space_follows_previous_token ()
16259
0b5ab09dfce4 2/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
649 && ! (tok == '[' || tok == '{'
0b5ab09dfce4 2/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
650 || curr_lexer->previous_token_is_binop ()))
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
651 {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
652 yyless (0);
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
653 unput (',');
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
654 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
655 else
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
656 {
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
657 if (! curr_lexer->looking_at_decl_list
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
658 && curr_lexer->previous_token_may_be_command ())
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
659 {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
660 yyless (0);
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
661 curr_lexer->push_start_state (COMMAND_START);
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
662 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
663 else
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
664 {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
665 int id_tok = curr_lexer->handle_identifier ();
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
666
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
667 if (id_tok >= 0)
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
668 return curr_lexer->count_token_internal (id_tok);
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
669 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
670 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
671 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
672
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
673 %{
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
674 // Superclass method identifiers.
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
675 %}
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
676
16261
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
677 {IDENT}@{IDENT} |
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
678 {IDENT}@{IDENT}.{IDENT} {
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
679 curr_lexer->lexer_debug ("{IDENT}@{IDENT}|{IDENT}@{IDENT}.{IDENT}");
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
680
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
681 int id_tok = curr_lexer->handle_superclass_identifier ();
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
682
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
683 if (id_tok >= 0)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
684 {
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
685 curr_lexer->looking_for_object_index = true;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
686
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
687 return curr_lexer->count_token_internal (SUPERCLASSREF);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
688 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
689 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
690
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
691 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
692 // Metaclass query
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
693 %}
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
694
16261
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
695 \?{IDENT} |
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
696 \?{IDENT}\.{IDENT} {
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
697 curr_lexer->lexer_debug ("\\?{IDENT}|\\?{IDENT}\\.{IDENT}");
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
698
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
699 int id_tok = curr_lexer->handle_meta_identifier ();
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
700
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
701 if (id_tok >= 0)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
702 {
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
703 curr_lexer->looking_for_object_index = true;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
704
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
705 return curr_lexer->count_token_internal (METAQUERY);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
706 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
707 }
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
708
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
709 "@" {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
710 curr_lexer->lexer_debug ("@");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
711
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
712 curr_lexer->current_input_column++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
713
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
714 curr_lexer->looking_at_function_handle++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
715 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
716 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
717
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
718 return curr_lexer->count_token ('@');
4342
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
719 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
720
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
721 %{
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
722 // 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
723 // 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
724 // 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
725 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
726
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
727 {NL} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
728 curr_lexer->lexer_debug ("{NL}");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
729
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
730 curr_lexer->input_line_number++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
731 curr_lexer->current_input_column = 1;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
732
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
733 if (curr_lexer->nesting_level.none ())
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
734 {
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
735 curr_lexer->at_beginning_of_statement = true;
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
736 return curr_lexer->count_token ('\n');
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
737 }
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
738 else if (curr_lexer->nesting_level.is_paren ())
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
739 {
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
740 curr_lexer->at_beginning_of_statement = false;
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
741 curr_lexer->gripe_matlab_incompatible ("bare newline inside parentheses");
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
742 }
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
743 else if (curr_lexer->nesting_level.is_bracket_or_brace ())
985
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe]
jwe
parents: 975
diff changeset
744 return LEXICAL_ERROR;
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
745 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
746
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
747 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
748 // 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
749 // operator.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
750 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
751
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
752 "'" {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
753 curr_lexer->lexer_debug ("'");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
754
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
755 if (curr_lexer->previous_token_may_be_command ()
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
756 && curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
757 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
758 yyless (0);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
759 curr_lexer->push_start_state (COMMAND_START);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
760 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
761 else
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
762 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
763 int tok = curr_lexer->previous_token_value ();
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
764
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
765 if (curr_lexer->whitespace_is_significant ())
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
766 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
767 if (curr_lexer->space_follows_previous_token ())
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
768 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
769 if (tok == '[' || tok == '{'
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
770 || curr_lexer->previous_token_is_binop ())
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
771 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
772 curr_lexer->current_input_column++;
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
773 int retval = curr_lexer->handle_string ('\'');
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
774 return curr_lexer->count_token_internal (retval);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
775 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
776 else
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
777 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
778 yyless (0);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
779 curr_lexer->xunput (',');
16281
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
780 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
781 curr_lexer->current_input_column--;
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
782 }
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
783 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
784 else
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
785 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
786 if (tok == '[' || tok == '{'
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
787 || curr_lexer->previous_token_is_binop ()
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
788 || curr_lexer->previous_token_is_keyword ())
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
789 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
790 curr_lexer->current_input_column++;
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
791 int retval = curr_lexer->handle_string ('\'');
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
792 return curr_lexer->count_token_internal (retval);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
793 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
794 else
16284
09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE.
John W. Eaton <jwe@octave.org>
parents: 16283
diff changeset
795 return curr_lexer->count_token (HERMITIAN);
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
796 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
797 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
798 else
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
799 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
800 if (! tok || tok == '[' || tok == '{' || tok == '('
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
801 || curr_lexer->previous_token_is_binop ()
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
802 || curr_lexer->previous_token_is_keyword ())
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
803 {
16261
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
804 curr_lexer->current_input_column++;
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
805 int retval = curr_lexer->handle_string ('\'');
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
806 return curr_lexer->count_token_internal (retval);
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
807 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
808 else
16284
09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE.
John W. Eaton <jwe@octave.org>
parents: 16283
diff changeset
809 return curr_lexer->count_token (HERMITIAN);
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
810 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
811 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
812 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
813
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
814 %{
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
815 // Double quotes always begin strings.
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
816 %}
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
817
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
818 \" {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
819 curr_lexer->lexer_debug ("\"");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
820
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
821 if (curr_lexer->previous_token_may_be_command ()
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
822 && curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
823 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
824 yyless (0);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
825 curr_lexer->push_start_state (COMMAND_START);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
826 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
827 else
16261
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
828 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
829 int tok = curr_lexer->previous_token_value ();
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
830
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
831 if (curr_lexer->whitespace_is_significant ())
16261
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
832 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
833 if (curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
834 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
835 if (tok == '[' || tok == '{'
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
836 || curr_lexer->previous_token_is_binop ())
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
837 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
838 curr_lexer->current_input_column++;
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
839 int retval = curr_lexer->handle_string ('"');
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
840 return curr_lexer->count_token_internal (retval);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
841 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
842 else
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
843 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
844 yyless (0);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
845 curr_lexer->xunput (',');
16281
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
846 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
847 curr_lexer->current_input_column--;
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
848 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
849 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
850 else
16261
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
851 {
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
852 curr_lexer->current_input_column++;
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
853 int retval = curr_lexer->handle_string ('"');
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
854 return curr_lexer->count_token_internal (retval);
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
855 }
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
856 }
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
857 else
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
858 {
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
859 curr_lexer->current_input_column++;
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
860 int retval = curr_lexer->handle_string ('"');
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
861 return curr_lexer->count_token_internal (retval);
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
862 }
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
863 }
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
864 }
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
865
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
866 %{
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
867 // Other operators.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
868 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
869
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
870 ":" { CMD_OR_OP (":", ':', true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
871 ".+" { CMD_OR_OP (".+", EPLUS, false); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
872 ".-" { CMD_OR_OP (".-", EMINUS, false); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
873 ".*" { CMD_OR_OP (".*", EMUL, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
874 "./" { CMD_OR_OP ("./", EDIV, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
875 ".\\" { CMD_OR_OP (".\\", ELEFTDIV, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
876 ".^" { CMD_OR_OP (".^", EPOW, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
877 ".**" { CMD_OR_OP (".**", EPOW, false); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
878 "<=" { CMD_OR_OP ("<=", EXPR_LE, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
879 "==" { CMD_OR_OP ("==", EXPR_EQ, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
880 "~=" { CMD_OR_OP ("~=", EXPR_NE, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
881 "!=" { CMD_OR_OP ("!=", EXPR_NE, false); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
882 ">=" { CMD_OR_OP (">=", EXPR_GE, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
883 "&" { CMD_OR_OP ("&", EXPR_AND, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
884 "|" { CMD_OR_OP ("|", EXPR_OR, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
885 "<" { CMD_OR_OP ("<", EXPR_LT, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
886 ">" { CMD_OR_OP (">", EXPR_GT, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
887 "*" { CMD_OR_OP ("*", '*', true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
888 "/" { CMD_OR_OP ("/", '/', true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
889
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
890 %{
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
891 // In Matlab, '\' may also trigger command syntax.
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
892 %}
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
893
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
894 "\\" { return curr_lexer->handle_op ("\\", LEFTDIV); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
895
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
896 "^" { CMD_OR_OP ("^", POW, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
897 "**" { CMD_OR_OP ("**", POW, false); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
898 "&&" { CMD_OR_OP ("&&", EXPR_AND_AND, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
899 "||" { CMD_OR_OP ("||", EXPR_OR_OR, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
900 "<<" { CMD_OR_OP ("<<", LSHIFT, false); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
901 ">>" { CMD_OR_OP (">>", RSHIFT, false); }
16265
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
902
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
903 ";" {
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
904 bool at_beginning_of_statement
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
905 = (! (curr_lexer->whitespace_is_significant ()
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
906 || curr_lexer->looking_at_object_index.front ()));
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
907
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
908 return curr_lexer->handle_op (";", ';', at_beginning_of_statement);
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
909 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
910
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
911 "+" { CMD_OR_UNARY_OP ("+", '+', true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
912 "-" { CMD_OR_UNARY_OP ("-", '-', true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
913
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
914 "~" { CMD_OR_UNARY_OP ("~", EXPR_NOT, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
915 "!" { CMD_OR_UNARY_OP ("!", EXPR_NOT, false); }
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
916
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
917 "," {
16265
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
918 bool at_beginning_of_statement
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
919 = (! (curr_lexer->whitespace_is_significant ()
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
920 || curr_lexer->looking_at_object_index.front ()));
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
921
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
922 return curr_lexer->handle_op (",", ',', at_beginning_of_statement);
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
923 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
924
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
925 ".'" {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
926 return curr_lexer->handle_op (".'", TRANSPOSE, false);
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
927 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
928
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
929 "++" {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
930 curr_lexer->lexer_debug ("++");
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
931
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
932 int tok = curr_lexer->handle_incompatible_unary_op (PLUS_PLUS, false);
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
933
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
934 if (tok < 0)
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
935 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
936 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
937 curr_lexer->xunput (',');
16281
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
938 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
939 curr_lexer->current_input_column--;
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
940 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
941 else
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
942 return tok;
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
943 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
944
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
945 "--" {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
946 curr_lexer->lexer_debug ("--");
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
947
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
948 int tok = curr_lexer->handle_incompatible_unary_op (MINUS_MINUS, false);
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
949
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
950 if (tok < 0)
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
951 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
952 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
953 curr_lexer->xunput (',');
16281
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
954 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
955 curr_lexer->current_input_column--;
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
956 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
957 else
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
958 return tok;
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
959 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
960
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
961 "(" {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
962 curr_lexer->lexer_debug ("(");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
963
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
964 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
965
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
966 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
967 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
968 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
969 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
970
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
971 if (! (tok == '[' || tok == '{'
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
972 || curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
973 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
974 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
975
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
976 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
977 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
978 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
979 curr_lexer->xunput (',');
16281
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
980 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
981 curr_lexer->current_input_column--;
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
982 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
983 else
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
984 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
985 // If we are looking for an object index, then push TRUE for
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
986 // looking_at_object_index. Otherwise, just push whatever state
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
987 // is current (so that we can pop it off the stack when we find
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
988 // the matching close paren).
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
989
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
990 curr_lexer->looking_at_object_index.push_front
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
991 (curr_lexer->looking_for_object_index);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
992
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
993 curr_lexer->looking_at_indirect_ref = false;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
994 curr_lexer->looking_for_object_index = false;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
995 curr_lexer->at_beginning_of_statement = false;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
996
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
997 curr_lexer->nesting_level.paren ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
998 curr_lexer->decrement_promptflag ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
999
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1000 return curr_lexer->handle_token ('(');
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1001 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1002 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1003
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1004 ")" {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1005 curr_lexer->lexer_debug (")");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1006
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1007 curr_lexer->nesting_level.remove ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1008 curr_lexer->current_input_column++;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1009
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1010 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1011
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1012 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1013 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1014
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1015 if (curr_lexer->looking_at_anon_fcn_args)
16265
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1016 {
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1017 curr_lexer->looking_at_anon_fcn_args = false;
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1018 curr_lexer->nesting_level.anon_fcn_body ();
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1019 }
13237
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists.
John W. Eaton <jwe@octave.org>
parents: 12801
diff changeset
1020
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1021 return curr_lexer->count_token (')');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1022 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1023
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1024 "." {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1025 curr_lexer->lexer_debug (".");
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1026
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1027 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1028 curr_lexer->at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1029
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1030 return curr_lexer->handle_token ('.');
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1031 }
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1032
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1033 %{
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1034 // = and op= operators.
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1035 %}
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1036
16273
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1037 "=" { return curr_lexer->handle_op ("=", '='); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1038 "+=" { return curr_lexer->handle_incompatible_op ("+=", ADD_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1039 "-=" { return curr_lexer->handle_incompatible_op ("-=", SUB_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1040 "*=" { return curr_lexer->handle_incompatible_op ("*=", MUL_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1041 "/=" { return curr_lexer->handle_incompatible_op ("/=", DIV_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1042 "\\=" { return curr_lexer->handle_incompatible_op ("\\=", LEFTDIV_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1043 ".+=" { return curr_lexer->handle_incompatible_op (".+=", ADD_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1044 ".-=" { return curr_lexer->handle_incompatible_op (".-=", SUB_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1045 ".*=" { return curr_lexer->handle_incompatible_op (".*=", EMUL_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1046 "./=" { return curr_lexer->handle_incompatible_op ("./=", EDIV_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1047 ".\\=" { return curr_lexer->handle_incompatible_op (".\\=", ELEFTDIV_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1048 "^=" { return curr_lexer->handle_incompatible_op ("^=", POW_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1049 "**=" { return curr_lexer->handle_incompatible_op ("^=", POW_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1050 ".^=" { return curr_lexer->handle_incompatible_op (".^=", EPOW_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1051 ".**=" { return curr_lexer->handle_incompatible_op (".^=", EPOW_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1052 "&=" { return curr_lexer->handle_incompatible_op ("&=", AND_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1053 "|=" { return curr_lexer->handle_incompatible_op ("|=", OR_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1054 "<<=" { return curr_lexer->handle_incompatible_op ("<<=", LSHIFT_EQ); }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16271
diff changeset
1055 ">>=" { return curr_lexer->handle_incompatible_op (">>=", RSHIFT_EQ); }
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1056
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1057 %{
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1058 // In Matlab, '{' may also trigger command syntax.
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1059 %}
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1060
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1061 "{" {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1062 curr_lexer->lexer_debug ("{");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1063
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1064 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1065
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1066 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1067 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1068 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1069 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1070
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1071 if (! (tok == '[' || tok == '{'
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1072 || curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1073 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1074 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1075
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1076 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1077 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1078 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1079 curr_lexer->xunput (',');
16281
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
1080 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
1081 curr_lexer->current_input_column--;
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1082 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1083 else
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1084 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1085 curr_lexer->nesting_level.brace ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1086
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1087 curr_lexer->looking_at_object_index.push_front
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1088 (curr_lexer->looking_for_object_index);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1089
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1090 curr_lexer->current_input_column += yyleng;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1091 curr_lexer->looking_for_object_index = false;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1092 curr_lexer->at_beginning_of_statement = false;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1093
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1094 curr_lexer->decrement_promptflag ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1095
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1096 curr_lexer->braceflag++;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1097
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1098 curr_lexer->push_start_state (MATRIX_START);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1099
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1100 return curr_lexer->count_token ('{');
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1101 }
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1102 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1103
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1104 "}" {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1105 curr_lexer->lexer_debug ("}");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1106
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1107 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1108
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1109 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1110 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1111
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1112 curr_lexer->nesting_level.remove ();
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1113
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1114 return curr_lexer->handle_token ('}');
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1115 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1116
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1117 %{
2066
a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe]
jwe
parents: 2042
diff changeset
1118 // Unrecognized input is a lexical error.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1119 %}
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1120
2042
31f4f775b8c6 [project @ 1996-03-28 09:06:28 by jwe]
jwe
parents: 1994
diff changeset
1121 . {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1122 curr_lexer->lexer_debug (".");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1123
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1124 curr_lexer->xunput (yytext[0]);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1125
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1126 int c = curr_lexer->text_yyinput ();
4248
eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe]
jwe
parents: 4241
diff changeset
1127
16294
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
1128 if (c == 1)
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
1129 return -1;
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
1130 else if (c == EOF)
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
1131 return curr_lexer->handle_end_of_input ();
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
1132 else
4240
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
1133 {
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1134 curr_lexer->current_input_column++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1135
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
1136 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
1137 undo_string_escape (static_cast<char> (c)), c,
16110
7302f8a4df83 use pointer for global lexical_feedback structure
John W. Eaton <jwe@octave.org>
parents: 16106
diff changeset
1138 curr_lexer->input_line_number, curr_lexer->current_input_column);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1139
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1140 return LEXICAL_ERROR;
4240
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
1141 }
2066
a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe]
jwe
parents: 2042
diff changeset
1142 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1143
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1144 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1145
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1146 static void
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1147 display_character (char c)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1148 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1149 if (isgraph (c))
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1150 std::cerr << c;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1151 else
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1152 switch (c)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1153 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1154 case 0:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1155 std::cerr << "NUL";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1156 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1157
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1158 case 1:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1159 std::cerr << "SOH";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1160 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1161
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1162 case 2:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1163 std::cerr << "STX";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1164 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1165
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1166 case 3:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1167 std::cerr << "ETX";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1168 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1169
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1170 case 4:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1171 std::cerr << "EOT";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1172 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1173
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1174 case 5:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1175 std::cerr << "ENQ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1176 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1177
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1178 case 6:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1179 std::cerr << "ACK";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1180 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1181
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1182 case 7:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1183 std::cerr << "\\a";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1184 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1185
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1186 case 8:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1187 std::cerr << "\\b";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1188 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1189
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1190 case 9:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1191 std::cerr << "\\t";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1192 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1193
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1194 case 10:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1195 std::cerr << "\\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1196 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1197
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1198 case 11:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1199 std::cerr << "\\v";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1200 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1201
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1202 case 12:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1203 std::cerr << "\\f";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1204 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1205
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1206 case 13:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1207 std::cerr << "\\r";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1208 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1209
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1210 case 14:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1211 std::cerr << "SO";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1212 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1213
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1214 case 15:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1215 std::cerr << "SI";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1216 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1217
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1218 case 16:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1219 std::cerr << "DLE";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1220 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1221
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1222 case 17:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1223 std::cerr << "DC1";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1224 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1225
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1226 case 18:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1227 std::cerr << "DC2";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1228 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1229
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1230 case 19:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1231 std::cerr << "DC3";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1232 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1233
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1234 case 20:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1235 std::cerr << "DC4";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1236 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1237
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1238 case 21:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1239 std::cerr << "NAK";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1240 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1241
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1242 case 22:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1243 std::cerr << "SYN";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1244 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1245
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1246 case 23:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1247 std::cerr << "ETB";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1248 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1249
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1250 case 24:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1251 std::cerr << "CAN";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1252 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1253
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1254 case 25:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1255 std::cerr << "EM";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1256 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1257
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1258 case 26:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1259 std::cerr << "SUB";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1260 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1261
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1262 case 27:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1263 std::cerr << "ESC";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1264 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1265
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1266 case 28:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1267 std::cerr << "FS";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1268 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1269
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1270 case 29:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1271 std::cerr << "GS";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1272 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1273
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1274 case 30:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1275 std::cerr << "RS";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1276 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1277
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1278 case 31:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1279 std::cerr << "US";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1280 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1281
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1282 case 32:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1283 std::cerr << "SPACE";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1284 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1285
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1286 case 127:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1287 std::cerr << "DEL";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1288 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1289 }
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1290 }
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1291
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1292 bool
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1293 is_keyword (const std::string& s)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1294 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1295 // Parsing function names like "set.property_name" inside
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1296 // classdef-style class definitions is simplified by handling the
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1297 // "set" and "get" portions of the names using the same mechanism as
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1298 // is used for keywords. However, they are not really keywords in
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1299 // the language, so omit them from the list of possible keywords.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1300
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1301 return (octave_kw_hash::in_word_set (s.c_str (), s.length ()) != 0
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1302 && ! (s == "set" || s == "get"));
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1303 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1304
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1305 DEFUN (iskeyword, args, ,
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1306 "-*- texinfo -*-\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1307 @deftypefn {Built-in Function} {} iskeyword ()\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1308 @deftypefnx {Built-in Function} {} iskeyword (@var{name})\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1309 Return true if @var{name} is an Octave keyword. If @var{name}\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1310 is omitted, return a list of keywords.\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1311 @seealso{isvarname, exist}\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1312 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1313 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1314 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1315
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1316 int argc = args.length () + 1;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1317
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1318 string_vector argv = args.make_argv ("iskeyword");
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1319
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1320 if (error_state)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1321 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1322
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1323 if (argc == 1)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1324 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1325 // Neither set and get are keywords. See the note in the
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1326 // is_keyword function for additional details.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1327
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1328 string_vector lst (TOTAL_KEYWORDS);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1329
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1330 int j = 0;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1331
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1332 for (int i = 0; i < TOTAL_KEYWORDS; i++)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1333 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1334 std::string tmp = wordlist[i].name;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1335
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1336 if (! (tmp == "set" || tmp == "get"))
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1337 lst[j++] = tmp;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1338 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1339
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1340 lst.resize (j);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1341
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1342 retval = Cell (lst.sort ());
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1343 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1344 else if (argc == 2)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1345 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1346 retval = is_keyword (argv[1]);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1347 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1348 else
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1349 print_usage ();
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1350
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1351 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1352 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1353
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1354 /*
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1355
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1356 %!assert (iskeyword ("for"))
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1357 %!assert (iskeyword ("fort"), false)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1358 %!assert (iskeyword ("fft"), false)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1359
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1360 */
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1361
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1362 // Used to delete trailing white space from tokens.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1363
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1364 static std::string
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1365 strip_trailing_whitespace (char *s)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1366 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1367 std::string retval = s;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1368
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1369 size_t pos = retval.find_first_of (" \t");
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1370
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1371 if (pos != std::string::npos)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1372 retval.resize (pos);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1373
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1374 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1375 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1376
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1377 DEFUN (__display_tokens__, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1378 "-*- texinfo -*-\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1379 @deftypefn {Built-in Function} {} __display_tokens__ ()\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1380 Query or set the internal variable that determines whether Octave's\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1381 lexer displays tokens as they are read.\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1382 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1383 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1384 return SET_INTERNAL_VARIABLE (display_tokens);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1385 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1386
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1387 DEFUN (__token_count__, , ,
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1388 "-*- texinfo -*-\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1389 @deftypefn {Built-in Function} {} __token_count__ ()\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1390 Number of language tokens processed since Octave startup.\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1391 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1392 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1393 return octave_value (Vtoken_count);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1394 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1395
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1396 DEFUN (__lexer_debug_flag__, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1397 "-*- texinfo -*-\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1398 @deftypefn {Built-in Function} {@var{old_val} =} __lexer_debug_flag__ (@var{new_val}))\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1399 Undocumented internal function.\n\
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1400 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1401 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1402 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1403
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1404 retval = set_internal_variable (lexer_debug_flag, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1405 "__lexer_debug_flag__");
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1406
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1407 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1408 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1409
16193
d7392bf42fd1 use inheritance to simplify initialization in octave_lexer constructor
John W. Eaton <jwe@octave.org>
parents: 16183
diff changeset
1410 lexical_feedback::~lexical_feedback (void)
d7392bf42fd1 use inheritance to simplify initialization in octave_lexer constructor
John W. Eaton <jwe@octave.org>
parents: 16183
diff changeset
1411 {
16230
4bf907906134 use a queue to hold tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 16229
diff changeset
1412 tokens.clear ();
16194
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1413 }
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1414
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1415 void
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1416 lexical_feedback::init (void)
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1417 {
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1418 // The closest paren, brace, or bracket nesting is not an object
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1419 // index.
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1420 looking_at_object_index.push_front (false);
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1421 }
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1422
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1423 void
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1424 lexical_feedback::reset (void)
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1425 {
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1426 end_of_input = false;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1427 at_beginning_of_statement = true;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1428 looking_at_anon_fcn_args = false;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1429 looking_at_return_list = false;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1430 looking_at_parameter_list = false;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1431 looking_at_decl_list = false;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1432 looking_at_initializer_expression = false;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1433 looking_at_matrix_or_assign_lhs = false;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1434 looking_for_object_index = false;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1435 looking_at_indirect_ref = false;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1436 parsing_class_method = false;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1437 maybe_classdef_get_set_method = false;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1438 parsing_classdef = false;
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1439 force_script = false;
16199
810a71122c25 move more global variables to octave_lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16195
diff changeset
1440 reading_fcn_file = false;
810a71122c25 move more global variables to octave_lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16195
diff changeset
1441 reading_script_file = false;
810a71122c25 move more global variables to octave_lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16195
diff changeset
1442 reading_classdef_file = false;
16194
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1443 input_line_number = 1;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1444 current_input_column = 1;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1445 bracketflag = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1446 braceflag = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1447 looping = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1448 defining_func = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1449 looking_at_function_handle = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1450 block_comment_nesting_level = 0;
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1451 token_count = 0;
16207
0467d68ca891 move current_input_line to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16203
diff changeset
1452 current_input_line = "";
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1453 comment_text = "";
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1454 help_text = "";
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1455 fcn_file_name = "";
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1456 fcn_file_full_name = "";
16194
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1457 looking_at_object_index.clear ();
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1458 looking_at_object_index.push_front (false);
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1459
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1460 while (! parsed_function_name.empty ())
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1461 parsed_function_name.pop ();
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1462
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1463 nesting_level.reset ();
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1464
16230
4bf907906134 use a queue to hold tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 16229
diff changeset
1465 tokens.clear ();
16194
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1466 }
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1467
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1468 int
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1469 lexical_feedback::previous_token_value (void) const
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1470 {
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1471 const token *tok = tokens.front ();
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1472 return tok ? tok->token_value () : 0;
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1473 }
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1474
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1475 bool
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1476 lexical_feedback::previous_token_value_is (int tok_val) const
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1477 {
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1478 const token *tok = tokens.front ();
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1479 return tok ? tok->token_value_is (tok_val) : false;
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1480 }
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1481
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1482 void
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1483 lexical_feedback::mark_previous_token_trailing_space (void)
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1484 {
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1485 token *tok = tokens.front ();
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1486 if (tok && ! previous_token_value_is ('\n'))
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1487 tok->mark_trailing_space ();
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1488 }
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1489
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1490 bool
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1491 lexical_feedback::space_follows_previous_token (void) const
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1492 {
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1493 const token *tok = tokens.front ();
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1494 return tok ? tok->space_follows_token () : false;
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1495 }
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1496
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1497 bool
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1498 lexical_feedback::previous_token_is_binop (void) const
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1499 {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1500 int tok = previous_token_value ();
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1501
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1502 return (tok == '+' || tok == '-' || tok == '@'
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1503 || tok == ',' || tok == ';' || tok == '*' || tok == '/'
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1504 || tok == ':' || tok == '=' || tok == ADD_EQ
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1505 || tok == AND_EQ || tok == DIV_EQ || tok == EDIV
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1506 || tok == EDIV_EQ || tok == ELEFTDIV || tok == ELEFTDIV_EQ
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1507 || tok == EMINUS || tok == EMUL || tok == EMUL_EQ
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1508 || tok == EPOW || tok == EPOW_EQ || tok == EXPR_AND
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1509 || tok == EXPR_AND_AND || tok == EXPR_EQ || tok == EXPR_GE
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1510 || tok == EXPR_GT || tok == EXPR_LE || tok == EXPR_LT
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1511 || tok == EXPR_NE || tok == EXPR_NOT || tok == EXPR_OR
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1512 || tok == EXPR_OR_OR || tok == LEFTDIV || tok == LEFTDIV_EQ
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1513 || tok == LSHIFT || tok == LSHIFT_EQ || tok == MUL_EQ
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1514 || tok == OR_EQ || tok == POW || tok == POW_EQ
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1515 || tok == RSHIFT || tok == RSHIFT_EQ || tok == SUB_EQ);
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1516 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1517
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1518 bool
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1519 lexical_feedback::previous_token_is_keyword (void) const
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1520 {
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1521 const token *tok = tokens.front ();
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1522 return tok ? tok->is_keyword () : false;
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1523 }
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1524
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1525 bool
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1526 lexical_feedback::previous_token_may_be_command (void) const
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1527 {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1528 const token *tok = tokens.front ();
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1529 return tok ? tok->may_be_command () : false;
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1530 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1531
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1532 static bool
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1533 looks_like_copyright (const std::string& s)
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1534 {
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1535 bool retval = false;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1536
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1537 if (! s.empty ())
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1538 {
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1539 size_t offset = s.find_first_not_of (" \t");
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1540
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1541 retval = (s.substr (offset, 9) == "Copyright" || s.substr (offset, 6) == "Author");
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1542 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1543
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1544 return retval;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1545 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
1546
16194
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1547 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1548 octave_base_lexer::input_buffer::fill (const std::string& input, bool eof_arg)
16183
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1549 {
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16194
diff changeset
1550 buffer = input;
16183
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1551 chars_left = buffer.length ();
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1552 pos = buffer.c_str ();
16195
b52d2f9294b6 use class for reading lexer input
John W. Eaton <jwe@octave.org>
parents: 16194
diff changeset
1553 eof = eof_arg;
16183
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1554 }
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1555
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1556 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1557 octave_base_lexer::input_buffer::copy_chunk (char *buf, size_t max_size)
16183
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1558 {
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1559 static const char * const eol = "\n";
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1560
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1561 size_t len = max_size > chars_left ? chars_left : max_size;
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1562 assert (len > 0);
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1563
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1564 memcpy (buf, pos, len);
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1565
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1566 chars_left -= len;
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1567 pos += len;
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1568
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1569 // Make sure input ends with a new line character.
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1570 if (chars_left == 0 && buf[len-1] != '\n')
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1571 {
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1572 if (len < max_size)
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1573 {
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1574 // There is enough room to plug the newline character in
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1575 // the buffer.
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1576 buf[len++] = '\n';
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1577 }
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1578 else
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1579 {
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1580 // There isn't enough room to plug the newline character
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1581 // in the buffer so arrange to have it returned on the next
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1582 // call to octave_base_lexer::read.
16183
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1583 pos = eol;
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1584 chars_left = 1;
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1585 }
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1586 }
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1587
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1588 return len;
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1589 }
359d56094efa handle lexer input buffering with class
John W. Eaton <jwe@octave.org>
parents: 16166
diff changeset
1590
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1591 octave_base_lexer::~octave_base_lexer (void)
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1592 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1593 yylex_destroy (scanner);
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1594 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1595
16123
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1596 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1597 octave_base_lexer::init (void)
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1598 {
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1599 yylex_init (&scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1600
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1601 // Make octave_base_lexer object available through yyextra in
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1602 // flex-generated lexer.
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1603 yyset_extra (this, scanner);
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
1604
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
1605 clear_start_state ();
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1606 }
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1607
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1608 // Inside Flex-generated functions, yyg is the scanner cast to its real
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1609 // type. Some flex macros that we use in octave_base_lexer member functions
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
1610 // (for example, BEGIN) use yyg. If we could perform the actions of
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
1611 // these macros with functions instead, we could eliminate the
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
1612 // OCTAVE_YYG macro.
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1613
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1614 #define OCTAVE_YYG \
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1615 struct yyguts_t *yyg = static_cast<struct yyguts_t*> (scanner)
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1616
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1617 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1618 octave_base_lexer::reset (void)
16123
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1619 {
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1620 // Start off on the right foot.
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
1621 clear_start_state ();
16123
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1622
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1623 parser_symtab_context.clear ();
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1624
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1625 // We do want a prompt by default.
16209
e7ff32e7cf82 move global promptflag variable to octave_reader class
John W. Eaton <jwe@octave.org>
parents: 16207
diff changeset
1626 promptflag (1);
16123
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1627
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1628 // Only ask for input from stdin if we are expecting interactive
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1629 // input.
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1630
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1631 if (! quitting_gracefully
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1632 && (interactive || forced_interactive)
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1633 && ! (reading_fcn_file
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1634 || reading_classdef_file
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1635 || reading_script_file
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1636 || input_from_eval_string ()))
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1637 yyrestart (stdin, scanner);
16123
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1638
16194
b7ca669af528 reset lexical_feedback state before starting a new parse
John W. Eaton <jwe@octave.org>
parents: 16193
diff changeset
1639 lexical_feedback::reset ();
16123
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1640 }
a484e39d1f22 maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16122
diff changeset
1641
16124
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1642 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1643 octave_base_lexer::prep_for_file (void)
16124
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1644 {
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1645 reading_script_file = true;
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1646
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
1647 push_start_state (INPUT_FILE_START);
16124
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1648 }
3be725cd195b move more lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16123
diff changeset
1649
16121
bdf365c5c9bf maint: move function definition in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16120
diff changeset
1650 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1651 octave_base_lexer::handle_end_of_input (void)
16164
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1652 {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1653 lexer_debug ("<<EOF>>");
16164
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1654
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1655 if (block_comment_nesting_level != 0)
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1656 {
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1657 warning ("block comment open at end of input");
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1658
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1659 if ((reading_fcn_file || reading_script_file || reading_classdef_file)
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1660 && ! fcn_file_name.empty ())
16164
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1661 warning ("near line %d of file '%s.m'",
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1662 input_line_number, fcn_file_name.c_str ());
16164
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1663 }
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1664
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1665 return handle_token (END_OF_INPUT);
16164
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1666 }
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1667
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1668 char *
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1669 octave_base_lexer::flex_yytext (void)
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1670 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1671 return yyget_text (scanner);
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1672 }
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1673
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
1674 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1675 octave_base_lexer::flex_yyleng (void)
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
1676 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1677 return yyget_leng (scanner);
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
1678 }
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
1679
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1680 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1681 octave_base_lexer::text_yyinput (void)
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1682 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1683 int c = yyinput (scanner);
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1684
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1685 if (lexer_debug_flag)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1686 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1687 std::cerr << "I: ";
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1688 display_character (c);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1689 std::cerr << std::endl;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1690 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1691
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1692 // Convert CRLF into just LF and single CR into LF.
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1693
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1694 if (c == '\r')
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1695 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1696 c = yyinput (scanner);
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1697
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1698 if (lexer_debug_flag)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1699 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1700 std::cerr << "I: ";
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1701 display_character (c);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1702 std::cerr << std::endl;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1703 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1704
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1705 if (c != '\n')
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1706 {
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1707 xunput (c);
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1708 c = '\n';
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1709 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1710 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1711
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1712 return c;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1713 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1714
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1715 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1716 octave_base_lexer::xunput (char c, char *buf)
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1717 {
16164
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1718 if (c != EOF)
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1719 {
16164
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1720 if (lexer_debug_flag)
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1721 {
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1722 std::cerr << "U: ";
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1723 display_character (c);
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1724 std::cerr << std::endl;
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1725 }
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1726
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class
John W. Eaton <jwe@octave.org>
parents: 16158
diff changeset
1727 yyunput (c, buf, scanner);
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1728 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1729 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
1730
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1731 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1732 octave_base_lexer::xunput (char c)
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1733 {
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1734 char *yytxt = flex_yytext ();
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
1735
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
1736 xunput (c, yytxt);
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1737 }
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1738
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1739 bool
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1740 octave_base_lexer::looking_at_space (void)
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1741 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1742 int c = text_yyinput ();
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1743 xunput (c);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1744 return (c == ' ' || c == '\t');
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1745 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1746
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1747 bool
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1748 octave_base_lexer::inside_any_object_index (void)
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1749 {
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1750 bool retval = false;
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1751
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1752 for (std::list<bool>::const_iterator i = looking_at_object_index.begin ();
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1753 i != looking_at_object_index.end (); i++)
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1754 {
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1755 if (*i)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1756 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1757 retval = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1758 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1759 }
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1760 }
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1761
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1762 return retval;
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1763 }
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1764
4238
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
1765 // 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
1766
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1767 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1768 octave_base_lexer::is_keyword_token (const std::string& s)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1769 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1770 int l = input_line_number;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1771 int c = current_input_column;
3805
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe]
jwe
parents: 3802
diff changeset
1772
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
1773 int len = s.length ();
922
708827b941b4 [project @ 1994-11-14 22:14:13 by jwe]
jwe
parents: 916
diff changeset
1774
5088
7830f271a53f [project @ 2004-12-01 19:54:45 by jwe]
jwe
parents: 5035
diff changeset
1775 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
1776
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1777 if (kw)
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 120
diff changeset
1778 {
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1779 token *tok_val = 0;
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1780
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1781 switch (kw->kw_id)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1782 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1783 case break_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1784 case catch_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1785 case continue_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1786 case else_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1787 case otherwise_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1788 case return_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1789 case unwind_protect_cleanup_kw:
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1790 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1791 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1792
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1793 case static_kw:
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1794 if ((reading_fcn_file || reading_script_file
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1795 || reading_classdef_file)
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1796 && ! fcn_file_full_name.empty ())
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1797 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
1798 "the 'static' keyword is obsolete and will be removed from a future version of Octave; please use 'persistent' instead; near line %d of file '%s'",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1799 input_line_number,
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1800 fcn_file_full_name.c_str ());
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1801 else
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1802 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
1803 "the 'static' keyword is obsolete and will be removed from a future version of Octave; please use 'persistent' instead; near line %d",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1804 input_line_number);
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1805 // fall through ...
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1806
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1807 case persistent_kw:
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1808 case global_kw:
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1809 looking_at_decl_list = true;
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1810 break;
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14292
diff changeset
1811
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1812 case case_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1813 case elseif_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1814 case until_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1815 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1816
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1817 case end_kw:
14645
cbc00b587f36 also allow "end" indexing in classdef files
John W. Eaton <jwe@octave.org>
parents: 14642
diff changeset
1818 if (inside_any_object_index ()
cbc00b587f36 also allow "end" indexing in classdef files
John W. Eaton <jwe@octave.org>
parents: 14642
diff changeset
1819 || (! reading_classdef_file
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1820 && (defining_func
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1821 && ! (looking_at_return_list
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1822 || parsed_function_name.top ()))))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1823 return 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1824
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1825 tok_val = new token (end_kw, token::simple_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1826 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1827 break;
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 case end_try_catch_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1830 tok_val = new token (end_try_catch_kw, token::try_catch_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1831 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1832 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1833
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1834 case end_unwind_protect_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1835 tok_val = new token (end_unwind_protect_kw,
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1836 token::unwind_protect_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1837 at_beginning_of_statement = true;
10315
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 endfor_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1841 tok_val = new token (endfor_kw, token::for_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1842 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1843 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1844
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1845 case endfunction_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1846 tok_val = new token (endfunction_kw, token::function_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1847 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1848 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1849
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1850 case endif_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1851 tok_val = new token (endif_kw, token::if_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1852 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1853 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1854
13246
0c69a564f2be additional parfor changes
John W. Eaton <jwe@octave.org>
parents: 13245
diff changeset
1855 case endparfor_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1856 tok_val = new token (endparfor_kw, token::parfor_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1857 at_beginning_of_statement = true;
13246
0c69a564f2be additional parfor changes
John W. Eaton <jwe@octave.org>
parents: 13245
diff changeset
1858 break;
0c69a564f2be additional parfor changes
John W. Eaton <jwe@octave.org>
parents: 13245
diff changeset
1859
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1860 case endswitch_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1861 tok_val = new token (endswitch_kw, token::switch_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1862 at_beginning_of_statement = true;
10315
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 case endwhile_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1866 tok_val = new token (endwhile_kw, token::while_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1867 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1868 break;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1869
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1870 case endclassdef_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1871 tok_val = new token (endclassdef_kw, token::classdef_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1872 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1873 break;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1874
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1875 case endenumeration_kw:
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1876 tok_val = new token (endenumeration_kw, token::enumeration_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1877 at_beginning_of_statement = true;
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1878 break;
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1879
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1880 case endevents_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1881 tok_val = new token (endevents_kw, token::events_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1882 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1883 break;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1884
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1885 case endmethods_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1886 tok_val = new token (endmethods_kw, token::methods_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1887 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1888 break;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1889
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1890 case endproperties_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1891 tok_val = new token (endproperties_kw, token::properties_end, l, c);
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1892 at_beginning_of_statement = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1893 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1894
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
1895
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1896 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
1897 case parfor_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1898 case while_kw:
16209
e7ff32e7cf82 move global promptflag variable to octave_reader class
John W. Eaton <jwe@octave.org>
parents: 16207
diff changeset
1899 decrement_promptflag ();
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1900 looping++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1901 break;
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 do_kw:
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1904 at_beginning_of_statement = true;
16209
e7ff32e7cf82 move global promptflag variable to octave_reader class
John W. Eaton <jwe@octave.org>
parents: 16207
diff changeset
1905 decrement_promptflag ();
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1906 looping++;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1907 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1908
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1909 case try_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1910 case unwind_protect_kw:
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1911 at_beginning_of_statement = true;
16209
e7ff32e7cf82 move global promptflag variable to octave_reader class
John W. Eaton <jwe@octave.org>
parents: 16207
diff changeset
1912 decrement_promptflag ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1913 break;
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 if_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1916 case switch_kw:
16209
e7ff32e7cf82 move global promptflag variable to octave_reader class
John W. Eaton <jwe@octave.org>
parents: 16207
diff changeset
1917 decrement_promptflag ();
10315
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 case get_kw:
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1921 case set_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1922 // 'get' and 'set' are keywords in classdef method
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1923 // declarations.
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1924 if (! maybe_classdef_get_set_method)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1925 return 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1926 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1927
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1928 case enumeration_kw:
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1929 case events_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1930 case methods_kw:
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1931 case properties_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1932 // 'properties', 'methods' and 'events' are keywords for
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1933 // classdef blocks.
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1934 if (! parsing_classdef)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1935 return 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1936 // fall through ...
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1937
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1938 case classdef_kw:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1939 // 'classdef' is always a keyword.
16209
e7ff32e7cf82 move global promptflag variable to octave_reader class
John W. Eaton <jwe@octave.org>
parents: 16207
diff changeset
1940 decrement_promptflag ();
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1941
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1942 if (! force_script && token_count == 0 && input_from_file ())
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1943 {
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1944 reading_classdef_file = true;
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1945 reading_script_file = false;
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1946 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1947 break;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1948
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1949 case function_kw:
16209
e7ff32e7cf82 move global promptflag variable to octave_reader class
John W. Eaton <jwe@octave.org>
parents: 16207
diff changeset
1950 decrement_promptflag ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1951
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1952 defining_func++;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1953 parsed_function_name.push (false);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1954
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1955 if (! force_script && token_count == 0 && input_from_file ())
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1956 {
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1957 reading_fcn_file = true;
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1958 reading_script_file = false;
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1959 }
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1960
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1961 if (! (reading_fcn_file || reading_script_file
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1962 || reading_classdef_file))
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1963 input_line_number = 1;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1964 break;
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1965
3174
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe]
jwe
parents: 3165
diff changeset
1966 case magic_file_kw:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1967 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1968 if ((reading_fcn_file || reading_script_file
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1969 || reading_classdef_file)
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1970 && ! fcn_file_full_name.empty ())
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1971 tok_val = new token (magic_file_kw, true,
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1972 fcn_file_full_name, l, c);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1973 else
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1974 tok_val = new token (magic_file_kw, "stdin", l, c);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1975 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1976 break;
3174
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe]
jwe
parents: 3165
diff changeset
1977
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe]
jwe
parents: 3165
diff changeset
1978 case magic_line_kw:
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1979 tok_val = new token (magic_line_kw, static_cast<double> (l),
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1980 "", l, c);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1981 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1982
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1983 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1984 panic_impossible ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1985 }
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1986
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1987 if (! tok_val)
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1988 tok_val = new token (kw->tok, true, l, c);
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
1989
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
1990 push_token (tok_val);
1497
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1991
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
1992 return kw->tok;
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 120
diff changeset
1993 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1994
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1995 return 0;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1996 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1997
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1998 bool
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
1999 octave_base_lexer::whitespace_is_significant (void)
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2000 {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2001 return (nesting_level.is_bracket ()
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2002 || (nesting_level.is_brace ()
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2003 && ! looking_at_object_index.front ()));
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2004 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2005
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2006 static inline bool
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2007 looks_like_hex (const char *s, int len)
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2008 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2009 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
2010 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2011
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2012 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2013 octave_base_lexer::handle_number (void)
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2014 {
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2015 double value = 0.0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2016 int nread = 0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2017
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2018 char *yytxt = flex_yytext ();
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2019
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2020 if (looks_like_hex (yytxt, strlen (yytxt)))
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2021 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2022 unsigned long ival;
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2023
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2024 nread = sscanf (yytxt, "%lx", &ival);
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2025
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2026 value = static_cast<double> (ival);
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2027 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2028 else
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2029 {
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2030 char *tmp = strsave (yytxt);
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2031
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2032 char *idx = strpbrk (tmp, "Dd");
2621
337a09dd1c06 [project @ 1997-01-24 21:49:41 by jwe]
jwe
parents: 2614
diff changeset
2033
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2034 if (idx)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2035 *idx = 'e';
3598
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2036
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2037 nread = sscanf (tmp, "%lf", &value);
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2038
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2039 delete [] tmp;
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe]
jwe
parents: 3575
diff changeset
2040 }
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2041
1826
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe]
jwe
parents: 1823
diff changeset
2042 // 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
2043
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2044 assert (nread == 1);
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2045
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2046 looking_for_object_index = false;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2047 at_beginning_of_statement = false;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2048
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2049 push_token (new token (NUM, value, yytxt, input_line_number,
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2050 current_input_column));
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2051
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
2052 current_input_column += flex_yyleng ();
972
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2053 }
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe]
jwe
parents: 971
diff changeset
2054
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2055 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2056 octave_base_lexer::handle_continuation (void)
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2057 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2058 char *yytxt = flex_yytext ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2059 int yylng = flex_yyleng ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2060
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2061 int offset = 1;
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2062 if (yytxt[0] == '\\')
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2063 gripe_matlab_incompatible_continuation ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2064 else
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2065 offset = 3;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2066
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2067 bool have_space = false;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2068 while (offset < yylng)
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2069 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2070 char c = yytxt[offset];
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2071 if (c == ' ' || c == '\t')
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2072 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2073 have_space = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2074 offset++;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2075 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2076 else
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2077 break;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2078 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2079
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2080 if (have_space)
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2081 mark_previous_token_trailing_space ();
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2082
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2083 bool have_comment = false;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2084 while (offset < yylng)
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2085 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2086 char c = yytxt[offset];
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2087 if (c == '#' || c == '%')
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2088 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2089 have_comment = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2090 offset++;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2091 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2092 else
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2093 break;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2094 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2095
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2096 if (have_comment)
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2097 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2098 comment_text = &yytxt[offset];
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2099
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2100 finish_comment (octave_comment_elt::end_of_line, true);
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2101 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2102
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2103 decrement_promptflag ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2104 input_line_number++;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2105 current_input_column = 1;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2106 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2107
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2108 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2109 octave_base_lexer::finish_comment (octave_comment_elt::comment_type typ,
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2110 bool looking_at_continuation)
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2111 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2112 bool copyright = looks_like_copyright (comment_text);
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2113
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2114 if (nesting_level.none () && help_text.empty ()
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2115 && ! comment_text.empty () && ! copyright)
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2116 help_text = comment_text;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2117
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2118 if (copyright)
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2119 typ = octave_comment_elt::copyright;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2120
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2121 octave_comment_buffer::append (comment_text, typ);
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2122
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2123 comment_text = "";
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2124
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2125 at_beginning_of_statement = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2126
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2127 if (! looking_at_continuation)
16281
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
2128 {
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
2129 xunput ('\n');
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
2130 // Adjust for newline that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
2131 input_line_number--;
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream
John W. Eaton <jwe@octave.org>
parents: 16277
diff changeset
2132 }
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2133 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
2134
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2135 // 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
2136 // 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
2137 // and including the new line character.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2138 //
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2139 // 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
2140 // 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
2141 // If non-whitespace characters are found before comment
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2142 // characters, return 0. Otherwise, return 1.
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2143
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
2144 // 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
2145
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2146 bool
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2147 octave_base_lexer::have_continuation (bool trailing_comments_ok)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2148 {
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
2149 std::ostringstream buf;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2150
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2151 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2152
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2153 bool in_comment = false;
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2154 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2155
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2156 int c = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3598
diff changeset
2157
7728
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 7723
diff changeset
2158 while ((c = text_yyinput ()) != EOF)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2159 {
3802
4f1a26a730fd [project @ 2001-02-26 20:26:14 by jwe]
jwe
parents: 3796
diff changeset
2160 buf << static_cast<char> (c);
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2161
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2162 switch (c)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2163 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2164 case ' ':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2165 case '\t':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2166 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2167 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2168 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2169 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2170 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2171 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2172
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2173 case '%':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2174 case '#':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2175 if (trailing_comments_ok)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2176 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2177 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2178 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2179 if (! beginning_of_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2180 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2181 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2182 else
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 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2185 in_comment = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2186 beginning_of_comment = 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 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2189 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2190 goto cleanup;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2191 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2192
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2193 case '\n':
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2194 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2195 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2196 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2197 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2198 }
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2199 current_input_column = 0;
16209
e7ff32e7cf82 move global promptflag variable to octave_reader class
John W. Eaton <jwe@octave.org>
parents: 16207
diff changeset
2200 decrement_promptflag ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2201 gripe_matlab_incompatible_continuation ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2202 return true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2203
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2204 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2205 if (in_comment)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2206 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2207 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2208 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2209 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2210 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2211 goto cleanup;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2212 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2213 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2214 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2215
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2216 xunput (c);
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2217 return false;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2218
3096
ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe]
jwe
parents: 3079
diff changeset
2219 cleanup:
4051
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe]
jwe
parents: 4037
diff changeset
2220
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
2221 std::string s = buf.str ();
4051
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe]
jwe
parents: 4037
diff changeset
2222
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe]
jwe
parents: 4037
diff changeset
2223 int len = s.length ();
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe]
jwe
parents: 4037
diff changeset
2224 while (len--)
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2225 xunput (s[len]);
3096
ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe]
jwe
parents: 3079
diff changeset
2226
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2227 return false;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2228 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2229
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14161
diff changeset
2230 // 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
2231 // 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
2232 // line character.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2233
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2234 bool
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2235 octave_base_lexer::have_ellipsis_continuation (bool trailing_comments_ok)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2236 {
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
2237 char c1 = text_yyinput ();
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2238 if (c1 == '.')
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2239 {
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
2240 char c2 = text_yyinput ();
1091
54abf1b3a8e9 [project @ 1995-02-02 00:30:14 by jwe]
jwe
parents: 1088
diff changeset
2241 if (c2 == '.' && have_continuation (trailing_comments_ok))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2242 return true;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2243 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2244 {
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2245 xunput (c2);
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2246 xunput (c1);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2247 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2248 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2249 else
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2250 xunput (c1);
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2251
2857
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe]
jwe
parents: 2856
diff changeset
2252 return false;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2253 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2254
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2255 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2256 octave_base_lexer::handle_string (char delim)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2257 {
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
2258 std::ostringstream buf;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2259
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2260 int bos_line = input_line_number;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2261 int bos_col = current_input_column;
3805
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe]
jwe
parents: 3802
diff changeset
2262
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2263 int c;
1031
59f5eb2d5eb3 [project @ 1995-01-15 21:11:11 by jwe]
jwe
parents: 1019
diff changeset
2264 int escape_pending = 0;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2265
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
2266 while ((c = text_yyinput ()) != EOF)
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2267 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2268 current_input_column++;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2269
3105
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3103
diff changeset
2270 if (c == '\\')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2271 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2272 if (delim == '\'' || escape_pending)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2273 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2274 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2275 escape_pending = 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2276 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2277 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2278 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2279 if (have_continuation (false))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2280 escape_pending = 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2281 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2282 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2283 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2284 escape_pending = 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2285 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2286 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2287 continue;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2288 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2289 else if (c == '.')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2290 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2291 if (delim == '\'' || ! have_ellipsis_continuation (false))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2292 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2293 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2294 else if (c == '\n')
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2295 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2296 error ("unterminated string constant");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2297 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2298 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2299 else if (c == delim)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2300 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2301 if (escape_pending)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2302 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2303 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2304 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2305 c = text_yyinput ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2306 if (c == delim)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2307 {
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2308 buf << static_cast<char> (c);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2309 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2310 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2311 {
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2312 std::string s;
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
2313 xunput (c);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2314
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2315 if (delim == '\'')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2316 s = buf.str ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2317 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2318 s = do_string_escapes (buf.str ());
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2319
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2320 if (delim == '"')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2321 gripe_matlab_incompatible ("\" used as string delimiter");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2322 else if (delim == '\'')
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2323 gripe_single_quote_string ();
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
2324
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2325 looking_for_object_index = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2326 at_beginning_of_statement = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2327
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2328 int tok = delim == '"' ? DQ_STRING : SQ_STRING;
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2329
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2330 push_token (new token (tok, s, bos_line, bos_col));
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2331
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2332 return tok;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2333 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2334 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2335 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2336 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2337 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2338 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2339 }
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2340
1031
59f5eb2d5eb3 [project @ 1995-01-15 21:11:11 by jwe]
jwe
parents: 1019
diff changeset
2341 escape_pending = 0;
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2342 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2343
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2344 return LEXICAL_ERROR;
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2345 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
2346
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2347 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2348 octave_base_lexer::handle_close_bracket (int bracket_type)
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2349 {
4612
d44675070f1a [project @ 2003-11-14 19:49:56 by jwe]
jwe
parents: 4608
diff changeset
2350 int retval = bracket_type;
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2351
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2352 if (! nesting_level.none ())
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2353 {
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2354 nesting_level.remove ();
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2355
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2356 if (bracket_type == ']')
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2357 bracketflag--;
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2358 else if (bracket_type == '}')
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2359 braceflag--;
4613
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe]
jwe
parents: 4612
diff changeset
2360 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2361 panic_impossible ();
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2362 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2363
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2364 pop_start_state ();
1001
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe]
jwe
parents: 991
diff changeset
2365
3208
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe]
jwe
parents: 3204
diff changeset
2366 return retval;
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2367 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
2368
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2369 bool
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2370 octave_base_lexer::looks_like_command_arg (void)
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2371 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
2372 bool space_before = space_follows_previous_token ();
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
2373 bool space_after = looking_at_space ();
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
2374
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
2375 return (space_before && ! space_after
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
2376 && previous_token_may_be_command ());
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2377 }
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2378
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2379 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2380 octave_base_lexer::handle_superclass_identifier (void)
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2381 {
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2382 std::string pkg;
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2383 char *yytxt = flex_yytext ();
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2384 std::string meth = strip_trailing_whitespace (yytxt);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2385 size_t pos = meth.find ("@");
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2386 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
2387 meth = meth.substr (0, pos - 1);
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2388
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2389 pos = cls.find (".");
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2390 if (pos != std::string::npos)
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2391 {
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2392 pkg = cls.substr (pos).substr (1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2393 cls = cls.substr (0, pos - 1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2394 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2395
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2396 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
2397 || is_keyword_token (pkg));
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2398 if (kw_token)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2399 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2400 error ("method, class and package names may not be keywords");
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2401 return LEXICAL_ERROR;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2402 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2403
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2404 push_token (new token (SUPERCLASSREF,
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2405 meth.empty () ? 0 : &(symbol_table::insert (meth)),
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2406 cls.empty () ? 0 : &(symbol_table::insert (cls)),
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2407 pkg.empty () ? 0 : &(symbol_table::insert (pkg)),
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2408 input_line_number, current_input_column));
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2409
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
2410 current_input_column += flex_yyleng ();
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2411
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2412 return SUPERCLASSREF;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2413 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2414
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2415 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2416 octave_base_lexer::handle_meta_identifier (void)
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2417 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2418 std::string pkg;
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2419 char *yytxt = flex_yytext ();
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2420 std::string cls = strip_trailing_whitespace (yytxt).substr (1);
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2421 size_t pos = cls.find (".");
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2422
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2423 if (pos != std::string::npos)
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2424 {
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2425 pkg = cls.substr (pos).substr (1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2426 cls = cls.substr (0, pos - 1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2427 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2428
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2429 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
2430 if (kw_token)
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2431 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2432 error ("class and package names may not be keywords");
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2433 return LEXICAL_ERROR;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2434 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2435
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2436 push_token (new token (METAQUERY,
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2437 cls.empty () ? 0 : &(symbol_table::insert (cls)),
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2438 pkg.empty () ? 0 : &(symbol_table::insert (pkg)),
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2439 input_line_number, current_input_column));
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2440
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
2441 current_input_column += flex_yyleng ();
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2442
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2443 return METAQUERY;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2444 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
2445
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2446 // 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
2447 // an identifier. Handles keywords. Return -1 if the identifier
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
2448 // should be ignored.
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 747
diff changeset
2449
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2450 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2451 octave_base_lexer::handle_identifier (void)
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
2452 {
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2453 char *yytxt = flex_yytext ();
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2454
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2455 std::string tok = yytxt;
16128
210039e91ad6 localize use of yytext with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16126
diff changeset
2456
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
2457 // If we are expecting a structure element, avoid recognizing
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
2458 // 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
2459 // 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
2460 // decide whether to insert a comma.
747
6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe]
jwe
parents: 661
diff changeset
2461
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2462 if (looking_at_indirect_ref)
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2463 {
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2464 push_token (new token (STRUCT_ELT, tok, input_line_number,
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2465 current_input_column));
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2466
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2467 looking_for_object_index = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2468
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
2469 current_input_column += flex_yyleng ();
2819
ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe]
jwe
parents: 2804
diff changeset
2470
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2926
diff changeset
2471 return STRUCT_ELT;
1072
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe]
jwe
parents: 1060
diff changeset
2472 }
747
6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe]
jwe
parents: 661
diff changeset
2473
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2474 // The is_keyword_token may reset
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2475 // at_beginning_of_statement. For example, if it sees
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2476 // 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
2477 // statement.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2478
16271
87069bd38107 8/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16269
diff changeset
2479 // May set at_beginning_of_statement to true.
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
2480 int kw_token = is_keyword_token (tok);
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
2481
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2482 // 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
2483 // 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
2484 // statement.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
2485
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2486 if (looking_at_function_handle)
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
2487 {
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
2488 if (kw_token)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2489 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2490 error ("function handles may not refer to keywords");
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 return LEXICAL_ERROR;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2493 }
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
2494 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2495 {
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2496 push_token (new token (FCN_HANDLE, tok, input_line_number,
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2497 current_input_column));
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2498
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
2499 current_input_column += flex_yyleng ();
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2500 looking_for_object_index = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2501
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2502 at_beginning_of_statement = false;
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2503
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2504 return FCN_HANDLE;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2505 }
4930
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
2506 }
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe]
jwe
parents: 4923
diff changeset
2507
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5088
diff changeset
2508 // 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
2509 // Keywords can be followed by identifiers.
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
2510
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
2511 if (kw_token)
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
2512 {
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
2513 if (kw_token >= 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2514 {
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
2515 current_input_column += flex_yyleng ();
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2516 looking_for_object_index = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2517 }
7722
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
2518
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents: 7720
diff changeset
2519 return kw_token;
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
2520 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
2521
4234
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe]
jwe
parents: 4233
diff changeset
2522 // 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
2523 // transformation of the end keyword...
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe]
jwe
parents: 4233
diff changeset
2524
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe]
jwe
parents: 4233
diff changeset
2525 if (tok == "end")
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
2526 tok = "__end__";
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
2527
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2528 token *tok_val = new token (NAME, &(symbol_table::insert (tok)),
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2529 input_line_number, current_input_column);
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2530
16269
488b0fef52c5 7/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16267
diff changeset
2531 if (at_beginning_of_statement
488b0fef52c5 7/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16267
diff changeset
2532 && (! (tok == "e"
488b0fef52c5 7/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16267
diff changeset
2533 || tok == "I" || tok == "i"
488b0fef52c5 7/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16267
diff changeset
2534 || tok == "J" || tok == "j"
488b0fef52c5 7/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16267
diff changeset
2535 || tok == "Inf" || tok == "inf"
488b0fef52c5 7/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16267
diff changeset
2536 || tok == "NaN" || tok == "nan")))
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2537 tok_val->mark_may_be_command ();
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2538
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2539 push_token (tok_val);
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
2540
16130
421dea028bbf localize use of yyleng with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16129
diff changeset
2541 current_input_column += flex_yyleng ();
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
2542
9324
29563379fa9b don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents: 8974
diff changeset
2543 if (tok != "__end__")
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2544 looking_for_object_index = true;
9324
29563379fa9b don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents: 8974
diff changeset
2545
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2546 at_beginning_of_statement = false;
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2547
146
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
2548 return NAME;
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
2549 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe]
jwe
parents: 143
diff changeset
2550
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2551 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2552 octave_base_lexer::maybe_warn_separator_insert (char sep)
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
2553 {
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2554 std::string nm = fcn_file_full_name;
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
2555
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
2556 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
2557 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
2558 "potential auto-insertion of '%c' near line %d",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2559 sep, input_line_number);
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
2560 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
2561 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
2562 "potential auto-insertion of '%c' near line %d of file %s",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2563 sep, input_line_number, nm.c_str ());
3388
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
2564 }
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe]
jwe
parents: 3351
diff changeset
2565
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2566 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2567 octave_base_lexer::gripe_single_quote_string (void)
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
2568 {
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2569 std::string nm = fcn_file_full_name;
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
2570
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
2571 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
2572 warning_with_id ("Octave:single-quote-string",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2573 "single quote delimited string near line %d",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2574 input_line_number);
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
2575 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5783
diff changeset
2576 warning_with_id ("Octave:single-quote-string",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2577 "single quote delimited string near line %d of file %s",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2578 input_line_number, nm.c_str ());
3400
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
2579 }
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe]
jwe
parents: 3388
diff changeset
2580
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2581 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2582 octave_base_lexer::gripe_matlab_incompatible (const std::string& msg)
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2583 {
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2584 std::string nm = fcn_file_full_name;
8974
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
2585
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
2586 if (nm.empty ())
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
2587 warning_with_id ("Octave:matlab-incompatible",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2588 "potential Matlab compatibility problem: %s",
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2589 msg.c_str ());
8974
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
2590 else
fde2a916b2ac include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents: 8950
diff changeset
2591 warning_with_id ("Octave:matlab-incompatible",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2592 "potential Matlab compatibility problem: %s near line %d offile %s",
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2593 msg.c_str (), input_line_number, nm.c_str ());
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2594 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2595
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2596 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2597 octave_base_lexer::maybe_gripe_matlab_incompatible_comment (char c)
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2598 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2599 if (c == '#')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2600 gripe_matlab_incompatible ("# used as comment character");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2601 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2602
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2603 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2604 octave_base_lexer::gripe_matlab_incompatible_continuation (void)
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2605 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2606 gripe_matlab_incompatible ("\\ used as line continuation marker");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2607 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2608
16113
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
2609 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2610 octave_base_lexer::gripe_matlab_incompatible_operator (const std::string& op)
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2611 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2612 std::string t = op;
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2613 int n = t.length ();
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2614 if (t[n-1] == '\n')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2615 t.resize (n-1);
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2616 gripe_matlab_incompatible (t + " used as operator");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2617 }
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2618
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2619 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2620 octave_base_lexer::push_token (token *tok)
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2621 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
2622 YYSTYPE *lval = yyget_lval (scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
2623 lval->tok_val = tok;
16230
4bf907906134 use a queue to hold tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 16229
diff changeset
2624 tokens.push (tok);
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2625 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2626
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2627 token *
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2628 octave_base_lexer::current_token (void)
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2629 {
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
2630 YYSTYPE *lval = yyget_lval (scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
2631 return lval->tok_val;
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2632 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2633
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2634 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2635 octave_base_lexer::display_token (int tok)
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2636 {
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2637 switch (tok)
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2638 {
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2639 case '=': std::cerr << "'='\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2640 case ':': std::cerr << "':'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2641 case '-': std::cerr << "'-'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2642 case '+': std::cerr << "'+'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2643 case '*': std::cerr << "'*'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2644 case '/': std::cerr << "'/'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2645 case ADD_EQ: std::cerr << "ADD_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2646 case SUB_EQ: std::cerr << "SUB_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2647 case MUL_EQ: std::cerr << "MUL_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2648 case DIV_EQ: std::cerr << "DIV_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2649 case LEFTDIV_EQ: std::cerr << "LEFTDIV_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2650 case POW_EQ: std::cerr << "POW_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2651 case EMUL_EQ: std::cerr << "EMUL_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2652 case EDIV_EQ: std::cerr << "EDIV_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2653 case ELEFTDIV_EQ: std::cerr << "ELEFTDIV_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2654 case EPOW_EQ: std::cerr << "EPOW_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2655 case AND_EQ: std::cerr << "AND_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2656 case OR_EQ: std::cerr << "OR_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2657 case LSHIFT_EQ: std::cerr << "LSHIFT_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2658 case RSHIFT_EQ: std::cerr << "RSHIFT_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2659 case LSHIFT: std::cerr << "LSHIFT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2660 case RSHIFT: std::cerr << "RSHIFT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2661 case EXPR_AND_AND: std::cerr << "EXPR_AND_AND\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2662 case EXPR_OR_OR: std::cerr << "EXPR_OR_OR\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2663 case EXPR_AND: std::cerr << "EXPR_AND\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2664 case EXPR_OR: std::cerr << "EXPR_OR\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2665 case EXPR_NOT: std::cerr << "EXPR_NOT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2666 case EXPR_LT: std::cerr << "EXPR_LT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2667 case EXPR_LE: std::cerr << "EXPR_LE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2668 case EXPR_EQ: std::cerr << "EXPR_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2669 case EXPR_NE: std::cerr << "EXPR_NE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2670 case EXPR_GE: std::cerr << "EXPR_GE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2671 case EXPR_GT: std::cerr << "EXPR_GT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2672 case LEFTDIV: std::cerr << "LEFTDIV\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2673 case EMUL: std::cerr << "EMUL\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2674 case EDIV: std::cerr << "EDIV\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2675 case ELEFTDIV: std::cerr << "ELEFTDIV\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2676 case EPLUS: std::cerr << "EPLUS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2677 case EMINUS: std::cerr << "EMINUS\n"; break;
16284
09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE.
John W. Eaton <jwe@octave.org>
parents: 16283
diff changeset
2678 case HERMITIAN: std::cerr << "HERMITIAN\n"; break;
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2679 case TRANSPOSE: std::cerr << "TRANSPOSE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2680 case PLUS_PLUS: std::cerr << "PLUS_PLUS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2681 case MINUS_MINUS: std::cerr << "MINUS_MINUS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2682 case POW: std::cerr << "POW\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2683 case EPOW: std::cerr << "EPOW\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2684
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2685 case NUM:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2686 case IMAG_NUM:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2687 {
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2688 token *tok_val = current_token ();
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2689 std::cerr << (tok == NUM ? "NUM" : "IMAG_NUM")
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2690 << " [" << tok_val->number () << "]\n";
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2691 }
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2692 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2693
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2694 case STRUCT_ELT:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2695 {
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2696 token *tok_val = current_token ();
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2697 std::cerr << "STRUCT_ELT [" << tok_val->text () << "]\n";
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2698 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2699 break;
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2700
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2701 case NAME:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2702 {
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2703 token *tok_val = current_token ();
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2704 symbol_table::symbol_record *sr = tok_val->sym_rec ();
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2705 std::cerr << "NAME";
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2706 if (sr)
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2707 std::cerr << " [" << sr->name () << "]";
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2708 std::cerr << "\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2709 }
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2710 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2711
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2712 case END: std::cerr << "END\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2713
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2714 case DQ_STRING:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2715 case SQ_STRING:
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2716 {
16148
10abbc493f50 delete unnecessary X-> references inside class X member functions
John W. Eaton <jwe@octave.org>
parents: 16146
diff changeset
2717 token *tok_val = current_token ();
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2718
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2719 std::cerr << (tok == DQ_STRING ? "DQ_STRING" : "SQ_STRING")
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2720 << " [" << tok_val->text () << "]\n";
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
2721 }
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2722 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2723
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2724 case FOR: std::cerr << "FOR\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2725 case WHILE: std::cerr << "WHILE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2726 case DO: std::cerr << "DO\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2727 case UNTIL: std::cerr << "UNTIL\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2728 case IF: std::cerr << "IF\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2729 case ELSEIF: std::cerr << "ELSEIF\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2730 case ELSE: std::cerr << "ELSE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2731 case SWITCH: std::cerr << "SWITCH\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2732 case CASE: std::cerr << "CASE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2733 case OTHERWISE: std::cerr << "OTHERWISE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2734 case BREAK: std::cerr << "BREAK\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2735 case CONTINUE: std::cerr << "CONTINUE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2736 case FUNC_RET: std::cerr << "FUNC_RET\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2737 case UNWIND: std::cerr << "UNWIND\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2738 case CLEANUP: std::cerr << "CLEANUP\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2739 case TRY: std::cerr << "TRY\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2740 case CATCH: std::cerr << "CATCH\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2741 case GLOBAL: std::cerr << "GLOBAL\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2742 case PERSISTENT: std::cerr << "PERSISTENT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2743 case FCN_HANDLE: std::cerr << "FCN_HANDLE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2744 case END_OF_INPUT: std::cerr << "END_OF_INPUT\n\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2745 case LEXICAL_ERROR: std::cerr << "LEXICAL_ERROR\n\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2746 case FCN: std::cerr << "FCN\n"; break;
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2747 case INPUT_FILE: std::cerr << "INPUT_FILE\n"; break;
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2748 case SUPERCLASSREF: std::cerr << "SUPERCLASSREF\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2749 case METAQUERY: std::cerr << "METAQUERY\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2750 case GET: std::cerr << "GET\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2751 case SET: std::cerr << "SET\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2752 case PROPERTIES: std::cerr << "PROPERTIES\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2753 case METHODS: std::cerr << "METHODS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2754 case EVENTS: std::cerr << "EVENTS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2755 case CLASSDEF: std::cerr << "CLASSDEF\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2756 case '\n': std::cerr << "\\n\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2757 case '\r': std::cerr << "\\r\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2758 case '\t': std::cerr << "TAB\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2759 default:
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2760 {
16166
cb80b1d062b1 don't attempt to print unprintable tokens
John W. Eaton <jwe@octave.org>
parents: 16164
diff changeset
2761 if (tok < 256 && tok > 31)
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2762 std::cerr << static_cast<char> (tok) << "\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2763 else
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2764 std::cerr << "UNKNOWN(" << tok << ")\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2765 }
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2766 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2767 }
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2768 }
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2769
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2770 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2771 octave_base_lexer::fatal_error (const char *msg)
16129
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
2772 {
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
2773 error (msg);
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
2774
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
2775 OCTAVE_QUIT;
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
2776
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
2777 yy_fatal_error (msg, scanner);
16129
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
2778 }
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
2779
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function
John W. Eaton <jwe@octave.org>
parents: 16128
diff changeset
2780 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2781 octave_base_lexer::lexer_debug (const char *pattern)
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2782 {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2783 if (lexer_debug_flag)
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2784 {
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2785 std::cerr << std::endl;
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2786
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2787 display_start_state ();
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2788
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2789 std::cerr << "P: " << pattern << std::endl;
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2790 std::cerr << "T: " << flex_yytext () << std::endl;
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2791 }
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
2792 }
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2793
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2794 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2795 octave_base_lexer::push_start_state (int state)
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2796 {
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2797 OCTAVE_YYG;
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2798
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2799 start_state_stack.push (state);
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2800
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2801 BEGIN (start_state ());
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2802 }
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2803
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2804 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2805 octave_base_lexer::pop_start_state (void)
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2806 {
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2807 OCTAVE_YYG;
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2808
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2809 start_state_stack.pop ();
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2810
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2811 BEGIN (start_state ());
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2812 }
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2813
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2814 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2815 octave_base_lexer::clear_start_state (void)
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2816 {
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2817 while (! start_state_stack.empty ())
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2818 start_state_stack.pop ();
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2819
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2820 push_start_state (INITIAL);
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2821 }
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2822
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2823 void
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2824 octave_base_lexer::display_start_state (void) const
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2825 {
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2826 std::cerr << "S: ";
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2827
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2828 switch (start_state ())
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2829 {
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2830 case INITIAL:
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2831 std::cerr << "INITIAL" << std::endl;
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2832 break;
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2833
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2834 case COMMAND_START:
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2835 std::cerr << "COMMAND_START" << std::endl;
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2836 break;
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2837
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2838 case MATRIX_START:
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2839 std::cerr << "MATRIX_START" << std::endl;
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2840 break;
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2841
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2842 case INPUT_FILE_START:
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2843 std::cerr << "INPUT_FILE_BEGIN" << std::endl;
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2844 break;
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2845
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2846 case BLOCK_COMMENT_START:
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2847 std::cerr << "BLOCK_COMMENT_START" << std::endl;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2848 break;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2849
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2850 case LINE_COMMENT_START:
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2851 std::cerr << "LINE_COMMENT_START" << std::endl;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2852 break;
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2853
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2854 default:
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2855 std::cerr << "UNKNOWN START STATE!" << std::endl;
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2856 break;
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2857 }
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
2858 }
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2859
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2860 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2861 octave_base_lexer::handle_op (const char *pattern, int tok, bool bos)
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2862 {
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2863 lexer_debug (pattern);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2864
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
2865 return handle_op_internal (tok, bos, true);
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2866 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2867
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2868 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2869 octave_base_lexer::handle_incompatible_op (const char *pattern, int tok,
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2870 bool bos)
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2871 {
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2872 lexer_debug (pattern);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2873
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
2874 return handle_op_internal (tok, bos, false);
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2875 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2876
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2877 bool
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2878 octave_base_lexer::maybe_unput_comma_before_unary_op (int tok)
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2879 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2880 int prev_tok = previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2881
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2882 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2883
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2884 if (whitespace_is_significant () && space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2885 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2886 int c = text_yyinput ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2887 xunput (c);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2888
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2889 bool space_after = (c == ' ' || c == '\t');
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2890
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
2891 if (! (prev_tok == '[' || prev_tok == '{'
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2892 || previous_token_is_binop ()
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2893 || ((tok == '+' || tok == '-') && space_after)))
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2894 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2895 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2896
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2897 return unput_comma;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2898 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2899
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2900 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2901 octave_base_lexer::handle_unary_op (int tok, bool bos)
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2902 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2903 return maybe_unput_comma_before_unary_op (tok)
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
2904 ? -1 : handle_op_internal (tok, bos, true);
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2905 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2906
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2907 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2908 octave_base_lexer::handle_incompatible_unary_op (int tok, bool bos)
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2909 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2910 return maybe_unput_comma_before_unary_op (tok)
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
2911 ? -1 : handle_op_internal (tok, bos, false);
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2912 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
2913
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2914 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2915 octave_base_lexer::handle_op_internal (int tok, bool bos, bool compat)
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2916 {
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2917 if (! compat)
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2918 gripe_matlab_incompatible_operator (flex_yytext ());
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2919
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2920 push_token (new token (tok, input_line_number, current_input_column));
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2921
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2922 current_input_column += flex_yyleng ();
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2923 looking_for_object_index = false;
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2924 at_beginning_of_statement = bos;
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2925
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2926 return count_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2927 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2928
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2929 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2930 octave_base_lexer::handle_token (const std::string& name, int tok)
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2931 {
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2932 token *tok_val = new token (tok, name, input_line_number,
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2933 current_input_column);
16231
2b15ae55c721 put all tokens in the token cache
John W. Eaton <jwe@octave.org>
parents: 16230
diff changeset
2934
2b15ae55c721 put all tokens in the token cache
John W. Eaton <jwe@octave.org>
parents: 16230
diff changeset
2935 return handle_token (tok, tok_val);
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2936 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2937
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2938 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2939 octave_base_lexer::handle_token (int tok, token *tok_val)
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2940 {
16231
2b15ae55c721 put all tokens in the token cache
John W. Eaton <jwe@octave.org>
parents: 16230
diff changeset
2941 if (! tok_val)
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2942 tok_val = new token (tok, input_line_number, current_input_column);
16231
2b15ae55c721 put all tokens in the token cache
John W. Eaton <jwe@octave.org>
parents: 16230
diff changeset
2943
2b15ae55c721 put all tokens in the token cache
John W. Eaton <jwe@octave.org>
parents: 16230
diff changeset
2944 push_token (tok_val);
2b15ae55c721 put all tokens in the token cache
John W. Eaton <jwe@octave.org>
parents: 16230
diff changeset
2945
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2946 current_input_column += flex_yyleng ();
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2947
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2948 return count_token_internal (tok);
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2949 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2950
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2951 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2952 octave_base_lexer::count_token (int tok)
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2953 {
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2954 token *tok_val = new token (tok, input_line_number, current_input_column);
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2955
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2956 push_token (tok_val);
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2957
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2958 return count_token_internal (tok);
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2959 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2960
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2961 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2962 octave_base_lexer::count_token_internal (int tok)
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2963 {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2964 if (tok != '\n')
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2965 {
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2966 Vtoken_count++;
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2967 token_count++;
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2968 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2969
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2970 return show_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2971 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2972
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2973 int
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2974 octave_base_lexer::show_token (int tok)
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2975 {
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2976 if (Vdisplay_tokens)
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2977 display_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2978
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2979 if (lexer_debug_flag)
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2980 {
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2981 std::cerr << "R: ";
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2982 display_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2983 std::cerr << std::endl;
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2984 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2985
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2986 return tok;
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
2987 }
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2988
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2989 int
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2990 octave_lexer::fill_flex_buffer (char *buf, unsigned max_size)
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2991 {
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2992 int status = 0;
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2993
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2994 if (input_buf.empty ())
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2995 {
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2996 bool eof = false;
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2997 current_input_line = input_reader.get_input (eof);
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2998 input_buf.fill (current_input_line, eof);
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
2999 }
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3000
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3001 if (! input_buf.empty ())
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3002 status = input_buf.copy_chunk (buf, max_size);
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3003 else
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3004 {
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3005 status = YY_NULL;
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3006
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3007 if (! input_buf.at_eof ())
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3008 fatal_error ("octave_base_lexer::fill_flex_buffer failed");
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3009 }
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3010
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3011 return status;
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
3012 }
16294
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3013
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3014 int
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3015 octave_push_lexer::fill_flex_buffer (char *buf, unsigned max_size)
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3016 {
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3017 int status = 0;
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3018
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3019 if (input_buf.empty () && ! input_buf.at_eof ())
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3020 input_buf.fill (std::string (1, static_cast<char> (1)), false);
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3021
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3022 if (! input_buf.empty ())
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3023 status = input_buf.copy_chunk (buf, max_size);
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3024 else
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3025 {
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3026 status = YY_NULL;
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3027
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3028 if (! input_buf.at_eof ())
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3029 fatal_error ("octave_base_lexer::fill_flex_buffer failed");
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3030 }
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3031
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3032 return status;
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
3033 }