Mercurial > octave

annotate libinterp/parse-tree/lex.ll @ 28586:703458652e30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lex.ll (base_lexer::handle_number): Eliminate shadowed variable warnings.
author John W. Eaton <jwe@octave.org>
date Fri, 17 Jul 2020 16:56:53 -0400
parents 96e7dc4c2214
children 6310bb807752
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
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
3 We are using the pure parser interface and the reentrant lexer interface
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 but the Octave parser and lexer are NOT properly reentrant because both
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 still use many global variables. It should be safe to create a parser
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 object and call it while another parser object is active (to parse a
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 callback function while the main interactive parser is waiting for
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 input, for example) if you take care to properly save and restore
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 (typically with an unwind_protect object) relevant global values before
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 and after the nested call.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11
16150
891a2a4df71f * lex.ll: Use C-style comments in preamble.
John W. Eaton <jwe@octave.org>
parents: 16149
diff changeset
12 */
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
13
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
14 %top {
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // Copyright (C) 1993-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
25 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
26 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
27 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
28 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
29 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
30 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
31 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
32 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
33 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
34 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
35 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
36 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
37 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
38 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
39
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21722
diff changeset
40 #if defined (HAVE_CONFIG_H)
22003
2d3972b802ff use consistent style for including config.h in source files
John W. Eaton <jwe@octave.org>
parents: 21987
diff changeset
41 # include "config.h"
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
42 #endif
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
43
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
44 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
24444
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
45 // This one needs to be global.
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
46 # pragma GCC diagnostic ignored "-Wunused-function"
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
47 // Disable these warnings for code that is generated by flex,
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
48 // including pattern rules. Push the current state so we can
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
49 // restore the warning state prior to functions we define at
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
50 // the bottom of the file.
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
51 # pragma GCC diagnostic push
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
52 # pragma GCC diagnostic ignored "-Wold-style-cast"
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
53 # pragma GCC diagnostic ignored "-Wsign-compare"
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
54 # pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
24445
fe54e9633815 lex.ll: Fix macro for implicit fallthrough warning.
John W. Eaton <jwe@octave.org>
parents: 24444
diff changeset
55 # if defined (HAVE_WARN_IMPLICIT_FALLTHROUGH)
24444
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
56 # pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
57 # endif
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
58 #endif
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
59
21332
db574711df78 eliminate deprecated register storage class specifier
John W. Eaton <jwe@octave.org>
parents: 21301
diff changeset
60 // Define away the deprecated register storage class specifier to avoid
db574711df78 eliminate deprecated register storage class specifier
John W. Eaton <jwe@octave.org>
parents: 21301
diff changeset
61 // potential warnings about it.
db574711df78 eliminate deprecated register storage class specifier
John W. Eaton <jwe@octave.org>
parents: 21301
diff changeset
62 #if ! defined (register)
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21722
diff changeset
63 # define register
21332
db574711df78 eliminate deprecated register storage class specifier
John W. Eaton <jwe@octave.org>
parents: 21301
diff changeset
64 #endif
db574711df78 eliminate deprecated register storage class specifier
John W. Eaton <jwe@octave.org>
parents: 21301
diff changeset
65
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
66 }
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
67
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
68 %option prefix = "octave_"
16146
b6050fc0a2d9 use %option noyywrap
John W. Eaton <jwe@octave.org>
parents: 16139
diff changeset
69 %option noyywrap
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
70 %option reentrant
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16148
diff changeset
71 %option bison-bridge
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
72
19784
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
73 %option noyyalloc
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
74 %option noyyrealloc
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
75 %option noyyfree
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
76
18234
af8a70d6885c improve command parsing
Michael C. Grant <mcg@cvxr.com>
parents: 18231
diff changeset
77 %x COMMAND_START
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
78 %s MATRIX_START
4240
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
79
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
80 %x INPUT_FILE_START
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
81
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
82 %x BLOCK_COMMENT_START
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
83 %x LINE_COMMENT_START
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
84
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
85 %x DQ_STRING_START
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
86 %x SQ_STRING_START
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
87
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
88 %x FQ_IDENT_START
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
89
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
90 %{
240
a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe]
jwe
parents: 216
diff changeset
91
1341
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe]
jwe
parents: 1315
diff changeset
92 #include <cctype>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe]
jwe
parents: 1315
diff changeset
93 #include <cstring>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe]
jwe
parents: 1315
diff changeset
94
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
95 #include <algorithm>
8950
d865363208d6 include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
96 #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
97 #include <set>
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5615
diff changeset
98 #include <sstream>
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
99 #include <string>
4214
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
100 #include <stack>
1823
5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe]
jwe
parents: 1755
diff changeset
101
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2900
diff changeset
102 #include "cmd-edit.h"
21910
4d723ba06b4a provide wrappers for some unistd.h functions
John W. Eaton <jwe@octave.org>
parents: 21814
diff changeset
103 #include "lo-mappers.h"
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4131
diff changeset
104 #include "quit.h"
21910
4d723ba06b4a provide wrappers for some unistd.h functions
John W. Eaton <jwe@octave.org>
parents: 21814
diff changeset
105 #include "unistd-wrappers.h"
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2900
diff changeset
106
16154
aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment.
John W. Eaton <jwe@octave.org>
parents: 16150
diff changeset
107 // 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
108 // 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
109 // 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
110 // 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
111 // times.
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe]
jwe
parents: 1489
diff changeset
112
4264
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe]
jwe
parents: 4248
diff changeset
113 #include "Cell.h"
2181
138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe]
jwe
parents: 2167
diff changeset
114 #include "defun.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
115 #include "error.h"
21100
e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents: 21074
diff changeset
116 #include "errwarn.h"
1351
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1341
diff changeset
117 #include "input.h"
22094
9203833cab7d move new interpreter class to separate file
John W. Eaton <jwe@octave.org>
parents: 22089
diff changeset
118 #include "interpreter.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
119 #include "lex.h"
22089
c2c668b3051b use classes for octave application and interpreter
John W. Eaton <jwe@octave.org>
parents: 22003
diff changeset
120 #include "octave.h"
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
121 #include "ov.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
122 #include "parse.h"
2987
ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe]
jwe
parents: 2982
diff changeset
123 #include "pt-all.h"
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
124 #include "symtab.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2877
diff changeset
125 #include "token.h"
1355
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
126 #include "utils.h"
94697d007075 [project @ 1995-09-05 20:04:15 by jwe]
jwe
parents: 1351
diff changeset
127 #include "variables.h"
23479
06bf3a0b08bf maint: Use "" instead of <> for our own include files.
John W. Eaton <jwe@octave.org>
parents: 23220
diff changeset
128 #include "oct-parse.h"
06bf3a0b08bf maint: Use "" instead of <> for our own include files.
John W. Eaton <jwe@octave.org>
parents: 23220
diff changeset
129 #include "oct-gperf.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
130
18974
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 18774
diff changeset
131 // FIXME: with bison 3.x, OCTAVE_STYPE appears in the generated
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 18774
diff changeset
132 // oct-parse.h file, but there is no definition for YYSTYPE, which is
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 18774
diff changeset
133 // needed by the code that is generated by flex. I can't seem to find a
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 18774
diff changeset
134 // way to tell flex to use OCTAVE_STYPE instead of YYSTYPE in the code
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 18774
diff changeset
135 // it generates, or to tell bison to provide the definition of YYSTYPE
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 18774
diff changeset
136 // in the generated oct-parse.h file.
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 18774
diff changeset
137
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 18774
diff changeset
138 #if defined (OCTAVE_STYPE_IS_DECLARED) && ! defined YYSTYPE
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21722
diff changeset
139 # define YYSTYPE OCTAVE_STYPE
18974
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 18774
diff changeset
140 #endif
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 18774
diff changeset
141
21910
4d723ba06b4a provide wrappers for some unistd.h functions
John W. Eaton <jwe@octave.org>
parents: 21814
diff changeset
142 #define YY_NO_UNISTD_H 1
4d723ba06b4a provide wrappers for some unistd.h functions
John W. Eaton <jwe@octave.org>
parents: 21814
diff changeset
143 #define isatty octave_isatty_wrapper
4d723ba06b4a provide wrappers for some unistd.h functions
John W. Eaton <jwe@octave.org>
parents: 21814
diff changeset
144
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
145 #if ! (defined (FLEX_SCANNER) \
2716
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
146 && 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
147 && 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
148 #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
149 #endif
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe]
jwe
parents: 2702
diff changeset
150
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
151 #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
152 #define curr_lexer yyextra
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
153
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
154 // Arrange to get input via readline.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
155
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21722
diff changeset
156 #if defined (YY_INPUT)
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21722
diff changeset
157 # undef YY_INPUT
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
158 #endif
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
159 #define YY_INPUT(buf, result, max_size) \
16293
57e87ddfee14 create base class for lexer
John W. Eaton <jwe@octave.org>
parents: 16292
diff changeset
160 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
161
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
162 // 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
163
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21722
diff changeset
164 #if defined (YY_FATAL_ERROR)
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21722
diff changeset
165 # undef YY_FATAL_ERROR
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4678
diff changeset
166 #endif
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
167 #define YY_FATAL_ERROR(msg) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
168 (yyget_extra (yyscanner))->fatal_error (msg)
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
169
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
170 #define CMD_OR_OP(PATTERN, TOK, COMPAT) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
171 do \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
172 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
173 curr_lexer->lexer_debug (PATTERN); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
174 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
175 if (curr_lexer->looks_like_command_arg ()) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
176 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
177 yyless (0); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
178 curr_lexer->push_start_state (COMMAND_START); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
179 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
180 else \
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
181 return curr_lexer->handle_op (TOK, false, COMPAT); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
182 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
183 while (0)
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
184
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
185 #define CMD_OR_COMPUTED_ASSIGN_OP(PATTERN, TOK) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
186 do \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
187 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
188 curr_lexer->lexer_debug (PATTERN); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
189 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
190 if (curr_lexer->previous_token_may_be_command () \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
191 && curr_lexer->space_follows_previous_token ()) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
192 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
193 yyless (0); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
194 curr_lexer->push_start_state (COMMAND_START); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
195 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
196 else \
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
197 return curr_lexer->handle_op (TOK, false, false); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
198 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
199 while (0)
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
200
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
201 #define CMD_OR_UNARY_OP(PATTERN, TOK, COMPAT) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
202 do \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
203 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
204 curr_lexer->lexer_debug (PATTERN); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
205 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
206 if (curr_lexer->previous_token_may_be_command ()) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
207 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
208 if (curr_lexer->looks_like_command_arg ()) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
209 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
210 yyless (0); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
211 curr_lexer->push_start_state (COMMAND_START); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
212 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
213 else \
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
214 return curr_lexer->handle_op (TOK, false, COMPAT); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
215 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
216 else \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
217 { \
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
218 if (curr_lexer->maybe_unput_comma_before_unary_op (TOK)) \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
219 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
220 yyless (0); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
221 curr_lexer->xunput (','); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
222 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
223 else \
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
224 return curr_lexer->handle_op (TOK, false, COMPAT); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
225 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
226 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
227 while (0)
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
228
28147
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
229 #define HANDLE_EOB_OR_EOF(STATUS) \
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
230 do \
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
231 { \
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
232 if (curr_lexer->is_push_lexer ()) \
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
233 { \
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
234 if (curr_lexer->at_end_of_buffer ()) \
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
235 return STATUS; \
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
236 \
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
237 if (curr_lexer->at_end_of_file ()) \
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
238 return curr_lexer->handle_end_of_input (); \
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
239 } \
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
240 } \
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
241 while (0)
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
242
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
243 // If we are at the end of the buffer, ask for more input.
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
244 // If we are at the end of the file, deal with it.
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
245 // Otherwise, just keep going with the text from the current buffer.
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
246 #define HANDLE_STRING_CONTINUATION \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
247 do \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
248 { \
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
249 curr_lexer->m_filepos.next_line (); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
250 \
28147
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
251 HANDLE_EOB_OR_EOF (-1); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
252 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
253 while (0)
16914
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
254
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
255 #define HANDLE_NUMBER(PATTERN, BASE) \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
256 do \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
257 { \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
258 curr_lexer->lexer_debug (PATTERN); \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
259 \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
260 if (curr_lexer->previous_token_may_be_command () \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
261 && curr_lexer->space_follows_previous_token ()) \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
262 { \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
263 yyless (0); \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
264 curr_lexer->push_start_state (COMMAND_START); \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
265 } \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
266 else \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
267 { \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
268 int tok = curr_lexer->previous_token_value (); \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
269 \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
270 if (curr_lexer->whitespace_is_significant () \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
271 && curr_lexer->space_follows_previous_token () \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
272 && ! (tok == '[' || tok == '{' \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
273 || curr_lexer->previous_token_is_binop ())) \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
274 { \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
275 yyless (0); \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
276 unput (','); \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
277 } \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
278 else \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
279 return curr_lexer->handle_number<BASE> (); \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
280 } \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
281 } \
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
282 while (0)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
283
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
284 #define HANDLE_IDENTIFIER(pattern, get_set) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
285 do \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
286 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
287 curr_lexer->lexer_debug (pattern); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
288 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
289 int tok = curr_lexer->previous_token_value (); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
290 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
291 if (curr_lexer->whitespace_is_significant () \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
292 && curr_lexer->space_follows_previous_token () \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
293 && ! (tok == '[' || tok == '{' \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
294 || curr_lexer->previous_token_is_binop ())) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
295 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
296 yyless (0); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
297 unput (','); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
298 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
299 else \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
300 { \
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
301 if (! curr_lexer->m_looking_at_decl_list \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
302 && curr_lexer->previous_token_may_be_command ()) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
303 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
304 yyless (0); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
305 curr_lexer->push_start_state (COMMAND_START); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
306 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
307 else \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
308 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
309 if (get_set) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
310 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
311 yyless (3); \
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
312 curr_lexer->m_filepos.increment_column (3); \
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
313 curr_lexer->m_maybe_classdef_get_set_method = false; \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
314 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
315 \
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
316 return curr_lexer->handle_identifier (); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
317 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
318 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
319 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22196
diff changeset
320 while (0)
16914
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
321
26710
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
322 static inline bool
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
323 is_space_or_tab (char c)
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
324 {
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
325 return c == ' ' || c == '\t';
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
326 }
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
327
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
328 static inline bool
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
329 is_space_or_tab_or_eol (char c)
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
330 {
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
331 return c == ' ' || c == '\t' || c == '\n' || c == '\r';
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
332 }
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
333
28156
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
334 namespace octave
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
335 {
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
336 bool iskeyword (const std::string& s)
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
337 {
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
338 // Parsing function names like "set.property_name" inside
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
339 // classdef-style class definitions is simplified by handling the
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
340 // "set" and "get" portions of the names using the same mechanism
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
341 // as is used for keywords. However, they are not really keywords
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
342 // in the language, so omit them from the list of possible
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
343 // keywords. Likewise for "enumeration", "events", "methods", and
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
344 // "properties".
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
345
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
346 return (octave_kw_hash::in_word_set (s.c_str (), s.length ()) != nullptr
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
347 && ! (s == "set" || s == "get"
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
348 || s == "enumeration" || s == "events"
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
349 || s == "methods" || s == "properties"));
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
350 }
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
351 }
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
352
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
353 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
354
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
355 D [0-9]
20588
e34692daf663 Extend parser to accept '_' in numbers.
Rik <rik@octave.org>
parents: 20547
diff changeset
356 D_ [0-9_]
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
357 S [ \t]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
358 NL ((\n)|(\r)|(\r\n))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
359 CCHAR [#%]
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
360 IDENT ([_$a-zA-Z][_$a-zA-Z0-9]*)
26708
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
361 FQIDENT ({IDENT}({S}*\.{S}*{IDENT})*)
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
362
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
363 %{
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
364 // Decimal numbers may be real or imaginary but always create
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
365 // double precision constants initially. Any conversion to single
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
366 // precision happens as part of an expression evaluation in the
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
367 // interpreter, not the lexer and parser.
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
368 %}
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
369
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
370 DECIMAL_DIGITS ({D}{D_}*)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
371 EXPONENT ([DdEe][+-]?{DECIMAL_DIGITS})
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
372 REAL_DECIMAL ((({DECIMAL_DIGITS}\.?)|({DECIMAL_DIGITS}?\.{DECIMAL_DIGITS})){EXPONENT}?)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
373 IMAG_DECIMAL ({REAL_DECIMAL}[IiJj])
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
374 DECIMAL_NUMBER ({REAL_DECIMAL}|{IMAG_DECIMAL})
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
375
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
376 %{
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
377 // It is possible to specify signedness and size for binary and
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
378 // hexadecimal numbers but there is no special syntax for imaginary
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
379 // constants. Binary and hexadecimal constants always create integer
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
380 // valued constants ({u,}int{8,16,32,64}). If a size is not specified,
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
381 // the smallest integer type that will hold the value is used. Negative
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
382 // values may be created with a signed size specification by applying
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
383 // twos-complement conversion (for example, 0xffs8 produces an 8-bit
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
384 // signed integer equal to -1 and 0b10000000s8 produces an 8-bit signed
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
385 // integer equal to -128).
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
386 %}
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
387
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
388 SIZE_SUFFIX ([su](8|16|32|64))
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
389 BINARY_BITS (0[bB][01][01_]*)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
390 BINARY_NUMBER ({BINARY_BITS}|{BINARY_BITS}{SIZE_SUFFIX})
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
391 HEXADECIMAL_BITS (0[xX][0-9a-fA-F][0-9a-fA-F_]*)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
392 HEXADECIMAL_NUMBER ({HEXADECIMAL_BITS}|{HEXADECIMAL_BITS}{SIZE_SUFFIX})
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
393
18311
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281)
John W. Eaton <jwe@octave.org>
parents: 18246
diff changeset
394 ANY_EXCEPT_NL [^\r\n]
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
395 ANY_INCLUDING_NL (.|{NL})
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
396
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
397 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
398
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
399 %{
20835
14cd86258b3d use 'invalid' instead of 'bogus' in source files
John W. Eaton <jwe@octave.org>
parents: 20812
diff changeset
400 // Make script and function files start with an invalid token. This makes
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
401 // the parser go down a special path.
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
402 %}
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9324
diff changeset
403
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
404 <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
405 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
406
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
407 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
408
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
409 // 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
410 // as the first token.
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
411 curr_lexer->m_reading_script_file = true;
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
412
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
413 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
414
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
415 return curr_lexer->show_token (INPUT_FILE);
4238
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
416 }
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4237
diff changeset
417
18774
4293f49795d9 don't crash on empty script files (bug #42064)
John W. Eaton <jwe@octave.org>
parents: 18531
diff changeset
418 <INPUT_FILE_START><<EOF>> {
4293f49795d9 don't crash on empty script files (bug #42064)
John W. Eaton <jwe@octave.org>
parents: 18531
diff changeset
419 curr_lexer->lexer_debug ("<INPUT_FILE_START><<EOF>>");
4293f49795d9 don't crash on empty script files (bug #42064)
John W. Eaton <jwe@octave.org>
parents: 18531
diff changeset
420
4293f49795d9 don't crash on empty script files (bug #42064)
John W. Eaton <jwe@octave.org>
parents: 18531
diff changeset
421 // May be reset later if we see "function" or "classdef" appears
4293f49795d9 don't crash on empty script files (bug #42064)
John W. Eaton <jwe@octave.org>
parents: 18531
diff changeset
422 // as the first token.
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
423 curr_lexer->m_reading_script_file = true;
18774
4293f49795d9 don't crash on empty script files (bug #42064)
John W. Eaton <jwe@octave.org>
parents: 18531
diff changeset
424
4293f49795d9 don't crash on empty script files (bug #42064)
John W. Eaton <jwe@octave.org>
parents: 18531
diff changeset
425 curr_lexer->pop_start_state ();
4293f49795d9 don't crash on empty script files (bug #42064)
John W. Eaton <jwe@octave.org>
parents: 18531
diff changeset
426
4293f49795d9 don't crash on empty script files (bug #42064)
John W. Eaton <jwe@octave.org>
parents: 18531
diff changeset
427 return curr_lexer->show_token (INPUT_FILE);
4293f49795d9 don't crash on empty script files (bug #42064)
John W. Eaton <jwe@octave.org>
parents: 18531
diff changeset
428 }
4293f49795d9 don't crash on empty script files (bug #42064)
John W. Eaton <jwe@octave.org>
parents: 18531
diff changeset
429
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
430 %{
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
431 // Help and other command-style functions.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
432 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
433
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
434 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
435 // Commands can be continued on a second line using the ellipsis.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
436 // If an argument is in construction, it is completed.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
437 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
438
18312
7ac2a8b758fc maint: Periodic merge of stable to gui-release.
John W. Eaton <jwe@octave.org>
parents: 18247 18311
diff changeset
439 <COMMAND_START>(\.\.\.){ANY_EXCEPT_NL}*{NL} {
7ac2a8b758fc maint: Periodic merge of stable to gui-release.
John W. Eaton <jwe@octave.org>
parents: 18247 18311
diff changeset
440 curr_lexer->lexer_debug ("<COMMAND_START>(\\.\\.\\.){ANY_EXCEPT_NL}*{NL}");
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
441
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
442 if (! curr_lexer->m_string_text.empty ())
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
443 {
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
444 yyless (0);
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
445 curr_lexer->m_tok_end = curr_lexer->m_filepos;
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
446 return curr_lexer->finish_command_arg ();
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
447 }
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
448
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
449 HANDLE_STRING_CONTINUATION;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
450 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
451
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
452 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
453 // Commands normally end at the end of a line or a semicolon.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
454 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
455
18312
7ac2a8b758fc maint: Periodic merge of stable to gui-release.
John W. Eaton <jwe@octave.org>
parents: 18247 18311
diff changeset
456 <COMMAND_START>({CCHAR}{ANY_EXCEPT_NL}*)?{NL} {
7ac2a8b758fc maint: Periodic merge of stable to gui-release.
John W. Eaton <jwe@octave.org>
parents: 18247 18311
diff changeset
457 curr_lexer->lexer_debug ("<COMMAND_START>({CCHAR}{ANY_EXCEPT_NL}*)?{NL}");
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
458
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
459 if (! curr_lexer->m_string_text.empty ())
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
460 {
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
461 yyless (0);
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
462 curr_lexer->m_tok_end = curr_lexer->m_filepos;
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
463 return curr_lexer->finish_command_arg ();
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
464 }
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
465
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
466 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
467
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
468 curr_lexer->m_filepos.next_line ();
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
469 curr_lexer->m_looking_for_object_index = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
470 curr_lexer->m_at_beginning_of_statement = true;
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
471 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
472
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
473 return curr_lexer->handle_token ('\n');
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
474 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
475
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
476 <COMMAND_START>[\,\;] {
18234
af8a70d6885c improve command parsing
Michael C. Grant <mcg@cvxr.com>
parents: 18231
diff changeset
477 curr_lexer->lexer_debug ("<COMMAND_START>[\\,\\;]");
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
478
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
479 if (yytext[0] != ',' || curr_lexer->m_command_arg_paren_count == 0)
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
480 {
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
481 if (! curr_lexer->m_string_text.empty ())
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
482 {
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
483 yyless (0);
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
484 curr_lexer->m_tok_end = curr_lexer->m_filepos;
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
485 return curr_lexer->finish_command_arg ();
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
486 }
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
487
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
488 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
489
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
490 curr_lexer->m_looking_for_object_index = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
491 curr_lexer->m_at_beginning_of_statement = true;
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
492 curr_lexer->pop_start_state ();
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
493
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
494 return curr_lexer->handle_token (yytext[0]);
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
495 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
496 else
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
497 {
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
498 curr_lexer->m_string_text += yytext;
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
499 curr_lexer->m_filepos.increment_column (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
500 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
501 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
502
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
503 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
504 // Unbalanced parentheses serve as pseudo-quotes: they are included in
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
505 // the final argument string, but they cause parentheses and quotes to
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
506 // be slurped into that argument as well.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
507 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
508
18234
af8a70d6885c improve command parsing
Michael C. Grant <mcg@cvxr.com>
parents: 18231
diff changeset
509 <COMMAND_START>[\(\[\{]* {
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
510 curr_lexer->lexer_debug ("<COMMAND_START>[\\(\\[\\{]+");
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
511
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
512 curr_lexer->m_command_arg_paren_count += yyleng;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
513 curr_lexer->m_string_text += yytext;
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
514 curr_lexer->m_filepos.increment_column (yyleng);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
515 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
516
18234
af8a70d6885c improve command parsing
Michael C. Grant <mcg@cvxr.com>
parents: 18231
diff changeset
517 <COMMAND_START>[\)\]\}]* {
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
518 curr_lexer->lexer_debug ("<COMMAND_START>[\\)\\]\\}]+");
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
519
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
520 curr_lexer->m_command_arg_paren_count -= yyleng;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
521 curr_lexer->m_string_text += yytext;
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
522 curr_lexer->m_filepos.increment_column (yyleng);
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
523 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
524
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
525 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
526 // Handle quoted strings. Quoted strings that are not separated by
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
527 // whitespace from other argument text are combined with that previous
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
528 // text. For instance,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
529 //
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
530 // command 'text1'"text2"
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
531 //
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
532 // has a single argument text1text2, not two separate arguments.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
533 // That's why we must test to see if we are in command argument mode
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
534 // when processing the end of a string.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
535 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
536
4208
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe]
jwe
parents: 4198
diff changeset
537 <COMMAND_START>[\"\'] {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
538 curr_lexer->lexer_debug ("<COMMAND_START>[\\\"\\']");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
539
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
540 if (curr_lexer->m_command_arg_paren_count == 0)
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
541 curr_lexer->begin_string (yytext[0] == '"'
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
542 ? DQ_STRING_START : SQ_STRING_START);
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
543 else
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
544 curr_lexer->m_string_text += yytext;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
545
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
546 curr_lexer->m_filepos.increment_column (yyleng);
975
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
547 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe]
jwe
parents: 973
diff changeset
548
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
549 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
550 // In standard command argument processing, whitespace separates
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
551 // arguments. In the presence of unbalanced parentheses, it is
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
552 // incorporated into the argument.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
553 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
554
18234
af8a70d6885c improve command parsing
Michael C. Grant <mcg@cvxr.com>
parents: 18231
diff changeset
555 <COMMAND_START>{S}* {
af8a70d6885c improve command parsing
Michael C. Grant <mcg@cvxr.com>
parents: 18231
diff changeset
556 curr_lexer->lexer_debug ("<COMMAND_START>{S}*");
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
557
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
558 if (curr_lexer->m_command_arg_paren_count == 0)
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
559 {
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
560 if (! curr_lexer->m_string_text.empty ())
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
561 {
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
562 yyless (0);
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
563 curr_lexer->m_tok_end = curr_lexer->m_filepos;
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
564 return curr_lexer->finish_command_arg ();
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
565 }
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
566 }
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
567 else
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
568 curr_lexer->m_string_text += yytext;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
569
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
570 curr_lexer->m_filepos.increment_column (yyleng);
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
571 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
572
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
573 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
574 // Everything else is slurped into the command arguments.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
575 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
576
18234
af8a70d6885c improve command parsing
Michael C. Grant <mcg@cvxr.com>
parents: 18231
diff changeset
577 <COMMAND_START>([\.]|[^#% \t\r\n\.\,\;\"\'\(\[\{\}\]\)]*) {
18458
ebb878596bcf Restore escaped backslashes accidentally deleted by cset af8a70d6885c
Mike Miller <mtmiller@ieee.org>
parents: 18437
diff changeset
578 curr_lexer->lexer_debug ("<COMMAND_START>([\\.]|[^#% \\t\\r\\n\\.\\,\\;\\\"\\'\\(\\[\\{\\}\\]\\)]*");
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
579
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
580 curr_lexer->m_string_text += yytext;
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
581 curr_lexer->m_filepos.increment_column (yyleng);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
582 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
583
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
584 <MATRIX_START>{S}* {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
585 curr_lexer->lexer_debug ("<MATRIX_START>{S}*");
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
586
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
587 curr_lexer->m_filepos.increment_column (yyleng);
25708
ca38400776bc track column count in lexer in a few more places (bug #34852)
John W. Eaton <jwe@octave.org>
parents: 25646
diff changeset
588
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
589 curr_lexer->mark_previous_token_trailing_space ();
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
590 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
591
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
592 <MATRIX_START>{NL} {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
593 curr_lexer->lexer_debug ("<MATRIX_START>{NL}");
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
594
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
595 curr_lexer->m_filepos.next_line ();
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
596
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
597 if (curr_lexer->m_nesting_level.is_paren ())
21102
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX.
Rik <rik@octave.org>
parents: 21100
diff changeset
598 curr_lexer->warn_language_extension ("bare newline inside parentheses");
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
599 else
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
600 {
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
601 int tok = curr_lexer->previous_token_value ();
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
602
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
603 if (! (tok == ';' || tok == '[' || tok == '{'))
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
604 curr_lexer->xunput (';');
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
605 }
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
606 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
607
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
608 %{
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
609 // 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
610 // need to know if the next token is '=' or '=='.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
611 //
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
612 // 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
613 // 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
614 // operator.
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
615 //
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
616 // 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
617 // after seeing a ']' character...
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
618
17861
870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code.
Rik <rik@octave.org>
parents: 17744
diff changeset
619 // FIXME: we need to handle block comments here.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
620 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
621
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
622 <MATRIX_START>\] {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
623 curr_lexer->lexer_debug ("<MATRIX_START>\\]");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
624
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
625 curr_lexer->update_token_positions (yyleng);
25708
ca38400776bc track column count in lexer in a few more places (bug #34852)
John W. Eaton <jwe@octave.org>
parents: 25646
diff changeset
626 return curr_lexer->handle_close_bracket (']');
4608
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
627 }
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe]
jwe
parents: 4476
diff changeset
628
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
629 %{
17861
870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code.
Rik <rik@octave.org>
parents: 17744
diff changeset
630 // FIXME: we need to handle block comments here.
7723
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
631 %}
74f5e0c7de9e first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents: 7722
diff changeset
632
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
633 <MATRIX_START>\} {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
634 curr_lexer->lexer_debug ("<MATRIX_START>\\}*");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
635
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
636 curr_lexer->update_token_positions (yyleng);
25708
ca38400776bc track column count in lexer in a few more places (bug #34852)
John W. Eaton <jwe@octave.org>
parents: 25646
diff changeset
637 return curr_lexer->handle_close_bracket ('}');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
638 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
639
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
640 \[ {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
641 curr_lexer->lexer_debug ("\\[");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
642
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
643 bool unput_comma = false;
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
644
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
645 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
646 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
647 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
648 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
649
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
650 if (! (tok == '[' || tok == '{'
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
651 || curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
652 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
653 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
654
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
655 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
656 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
657 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
658 curr_lexer->xunput (',');
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
659 }
5615
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5570
diff changeset
660 else
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
661 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
662 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
663
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
664 curr_lexer->m_nesting_level.bracket ();
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
665
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
666 curr_lexer->m_looking_at_object_index.push_front (false);
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
667
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
668 curr_lexer->m_looking_for_object_index = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
669 curr_lexer->m_at_beginning_of_statement = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
670
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
671 if (curr_lexer->m_defining_func
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
672 && ! curr_lexer->m_parsed_function_name.top ())
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
673 curr_lexer->m_looking_at_return_list = true;
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
674 else
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
675 curr_lexer->m_looking_at_matrix_or_assign_lhs = true;
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
676
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
677 curr_lexer->m_bracketflag++;
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
678
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
679 curr_lexer->push_start_state (MATRIX_START);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
680
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
681 return curr_lexer->count_token ('[');
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
682 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
683 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
684
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
685 \] {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
686 curr_lexer->lexer_debug ("\\]");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
687
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
688 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
689
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
690 curr_lexer->m_nesting_level.remove ();
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
691
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
692 curr_lexer->m_looking_at_object_index.pop_front ();
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
693
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
694 curr_lexer->m_looking_for_object_index = true;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
695 curr_lexer->m_at_beginning_of_statement = false;
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
696
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
697 return curr_lexer->handle_token (']');
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
698 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
699
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
700 %{
27578
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
701 // Gobble comments. Both BLOCK_COMMENT_START and LINE_COMMENT_START
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
702 // are exclusive start states. We try to grab a continuous series of
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
703 // line-oriented comments as a single collection of comments.
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
704 %}
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
705
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
706 %{
27578
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
707 // Start of a block comment. Since comment start states are exclusive,
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
708 // this pattern will not match a block comment that immediately follows
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
709 // a line-oriented comment. All we need to do is push the matched text
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
710 // back on the input stream and push the new start state.
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
711 %}
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
712
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
713 ^{S}*{CCHAR}\{{S}*{NL} {
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
714 curr_lexer->lexer_debug ("^{S}*{CCHAR}\\{{S}*{NL}");
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
715
16253
a89cf57ba3a5 partial cleanup of continuation handling in lexer
John W. Eaton <jwe@octave.org>
parents: 16231
diff changeset
716 yyless (0);
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
717
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
718 curr_lexer->push_start_state (BLOCK_COMMENT_START);
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
719 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
720
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
721 <BLOCK_COMMENT_START>^{S}*{CCHAR}\{{S}*{NL} {
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
722 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
723
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
724 curr_lexer->m_filepos.next_line ();
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
725
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
726 if (curr_lexer->m_block_comment_nesting_level)
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
727 curr_lexer->m_comment_text = "\n";
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
728
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
729 curr_lexer->m_block_comment_nesting_level++;
28147
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
730
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
731 HANDLE_EOB_OR_EOF (-1);
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
732 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
733
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
734 %{
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
735 // End of a block comment. If this block comment is nested inside
27578
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
736 // another, wait for the outermost block comment to be closed before
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
737 // storing the comment.
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
738
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
739 // NOTE: This pattern must appear before the one below. Both may match
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
740 // the same text and this one should take precedence over the one that
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
741 // follows.
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
742 %}
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
743
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
744 <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
745 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
746
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
747 curr_lexer->m_filepos.next_line ();
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
748
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
749 if (curr_lexer->m_block_comment_nesting_level > 1)
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
750 curr_lexer->m_comment_text = "\n";
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
751 else
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
752 curr_lexer->finish_comment (octave::comment_elt::block);
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
753
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
754 curr_lexer->m_block_comment_nesting_level--;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
755
28147
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
756 int status = -1;
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
757
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
758 if (curr_lexer->m_block_comment_nesting_level == 0)
28147
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
759 {
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
760 status = -2;
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
761
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
762 curr_lexer->pop_start_state ();
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
763 }
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
764
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
765 HANDLE_EOB_OR_EOF (status);
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
766 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
767
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
768 %{
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
769 // Body of a block comment.
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
770 %}
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
771
18311
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281)
John W. Eaton <jwe@octave.org>
parents: 18246
diff changeset
772 <BLOCK_COMMENT_START>{ANY_EXCEPT_NL}*{NL} {
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281)
John W. Eaton <jwe@octave.org>
parents: 18246
diff changeset
773 curr_lexer->lexer_debug ("<BLOCK_COMMENT_START>{ANY_EXCEPT_NL}*{NL}");
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
774
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
775 curr_lexer->m_filepos.next_line ();
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
776 curr_lexer->m_comment_text += yytext;
28147
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
777
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28112
diff changeset
778 HANDLE_EOB_OR_EOF (-1);
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
779 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
780
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
781 %{
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
782 // Full-line or end-of-line comment.
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
783 %}
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
784
18311
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281)
John W. Eaton <jwe@octave.org>
parents: 18246
diff changeset
785 {S}*{CCHAR}{ANY_EXCEPT_NL}*{NL} {
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281)
John W. Eaton <jwe@octave.org>
parents: 18246
diff changeset
786 curr_lexer->lexer_debug ("{S}*{CCHAR}{ANY_EXCEPT_NL}*{NL}");
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
787
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
788 curr_lexer->push_start_state (LINE_COMMENT_START);
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
789 yyless (0);
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
790 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
791
27578
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
792 %{
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
793 // Beginning of a block comment while we are looking at a series of
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
794 // line-oriented comments. Finish previous comment, push current
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
795 // text back on input stream, and switch start states.
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
796
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
797 // NOTE: This pattern must appear before the one below. Both may match
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
798 // the same text and this one should take precedence over the one that
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
799 // follows.
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
800 %}
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
801
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
802 <LINE_COMMENT_START>^{S}*{CCHAR}\{{S}*{NL} {
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
803 curr_lexer->lexer_debug ("<LINE_COMMENT_START>^{S}*{CCHAR}\\{{S}*{NL}");
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
804
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
805 if (! curr_lexer->m_comment_text.empty ())
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
806 curr_lexer->finish_comment (octave::comment_elt::full_line);
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
807
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
808 curr_lexer->pop_start_state ();
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
809 curr_lexer->push_start_state (BLOCK_COMMENT_START);
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
810 yyless (0);
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
811 }
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
812
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
813 %{
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
814 // Line-oriented comment. If we are at the beginning of a line, this is
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
815 // part of a series of full-line comments. Otherwise, this is an end of
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
816 // line comment. We don't need to parse the matched text to determine
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
817 // whether we are looking at the start of a block comment as that
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
818 // pattern is handled above.
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
819
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
820 // NOTE: This pattern must appear before the one below. Both may match
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
821 // the same text and this one should take precedence over the one that
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
822 // follows.
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
823 %}
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
824
18311
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281)
John W. Eaton <jwe@octave.org>
parents: 18246
diff changeset
825 <LINE_COMMENT_START>{S}*{CCHAR}{ANY_EXCEPT_NL}*{NL} {
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281)
John W. Eaton <jwe@octave.org>
parents: 18246
diff changeset
826 curr_lexer->lexer_debug ("<LINE_COMMENT_START>{S}*{CCHAR}{ANY_EXCEPT_NL}*{NL}");
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
827
27578
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
828 // Grab text of comment without leading space or comment
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
829 // characters.
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
830
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
831 size_t i = 0;
27578
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
832 while (i < yyleng && is_space_or_tab (yytext[i]))
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
833 i++;
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
834
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
835 bool have_space = (i > 0);
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
836
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
837 while (i < yyleng && (yytext[i] == '#' || yytext[i] == '%'))
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
838 i++;
16363
d16c255299c0 recognize block comment begin while processing line comments (bug #38559)
John W. Eaton <jwe@octave.org>
parents: 16361
diff changeset
839
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
840 curr_lexer->m_comment_text += &yytext[i];
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
841
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
842 if (curr_lexer->m_filepos.column () == 1)
16363
d16c255299c0 recognize block comment begin while processing line comments (bug #38559)
John W. Eaton <jwe@octave.org>
parents: 16361
diff changeset
843 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
844 curr_lexer->m_filepos.next_line ();
16363
d16c255299c0 recognize block comment begin while processing line comments (bug #38559)
John W. Eaton <jwe@octave.org>
parents: 16361
diff changeset
845 }
d16c255299c0 recognize block comment begin while processing line comments (bug #38559)
John W. Eaton <jwe@octave.org>
parents: 16361
diff changeset
846 else
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
847 {
27578
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
848 // End of line comment.
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
849
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
850 if (have_space)
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
851 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
852
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
853 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
854
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
855 curr_lexer->pop_start_state ();
16337
6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549)
John W. Eaton <jwe@octave.org>
parents: 16334
diff changeset
856
27578
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
857 // Push the newline character back on the input and skip
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
858 // incrementing the line count so we don't have to duplicate
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
859 // all the possible actions that happen with newlines here.
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
860
16337
6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549)
John W. Eaton <jwe@octave.org>
parents: 16334
diff changeset
861 curr_lexer->xunput ('\n');
27578
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
862
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
863 // The next action should recognize a newline character and set
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
864 // the input column back to 1, but we should try to keep the
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
865 // input column location accurate anyway, so update here.
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
866 curr_lexer->m_filepos.increment_column (yyleng);
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
867 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
868 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
869
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
870 %{
27760
16e83787f970 fix handling of full line comments at command prompt (bug #57208)
John W. Eaton <jwe@octave.org>
parents: 27736
diff changeset
871 // End of a series of full-line because some other character was
16e83787f970 fix handling of full line comments at command prompt (bug #57208)
John W. Eaton <jwe@octave.org>
parents: 27736
diff changeset
872 // found on the input stream.
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
873 %}
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
874
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
875 <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
876 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
877
28264
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
878 if (yytext[0] == '\001')
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
879 {
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
880 // We are here because we are using the push parser/lexer
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
881 // interface and we hit the end of the input buffer or file.
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
882 // The special ASCII 1 marker is added to the input by
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
883 // push_lexer::fill_flex_buffer.
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
884
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
885 if (curr_lexer->pending_token_count () > 0)
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
886 {
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
887 // We are in the middle of parsing a command, expresison,
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
888 // etc., so set the return status so that if we are at the
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
889 // end of the buffer we'll continue looking for more input,
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
890 // possibly buffering a series of line oriented comments as
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
891 // a single block.
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
892
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
893 HANDLE_EOB_OR_EOF (-1);
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
894 }
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
895 else
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
896 {
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
897 // We are not in the process of parsing a command,
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
898 // expression, etc., so end any current sequence of comments
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
899 // with this full line comment, pop the start state and
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
900 // return as if we have just finished parsing a complete
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
901 // statement.
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
902
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
903 curr_lexer->finish_comment (octave::comment_elt::full_line);
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
904
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
905 curr_lexer->pop_start_state ();
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
906
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
907 HANDLE_EOB_OR_EOF (-2);
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
908 }
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
909 }
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
910 else
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
911 {
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
912 // End any current sequence of comments, pop the start state,
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
913 // and unput the pending input character that ended the series
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
914 // of comments.
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
915
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
916 curr_lexer->finish_comment (octave::comment_elt::full_line);
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
917
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
918 curr_lexer->pop_start_state ();
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
919
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
920 curr_lexer->xunput (yytext[0]);
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
921 }
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
922 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
923
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
924 %{
27578
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121)
John W. Eaton <jwe@octave.org>
parents: 27528
diff changeset
925 // End of file will also end a series of full-line comments.
17722
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342)
John W. Eaton <jwe@octave.org>
parents: 17693
diff changeset
926 %}
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342)
John W. Eaton <jwe@octave.org>
parents: 17693
diff changeset
927
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342)
John W. Eaton <jwe@octave.org>
parents: 17693
diff changeset
928 <LINE_COMMENT_START><<EOF>> {
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342)
John W. Eaton <jwe@octave.org>
parents: 17693
diff changeset
929 curr_lexer->lexer_debug ("<LINE_COMMENT_START><<EOF>>");
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342)
John W. Eaton <jwe@octave.org>
parents: 17693
diff changeset
930
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
931 curr_lexer->finish_comment (octave::comment_elt::full_line);
17722
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342)
John W. Eaton <jwe@octave.org>
parents: 17693
diff changeset
932
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342)
John W. Eaton <jwe@octave.org>
parents: 17693
diff changeset
933 curr_lexer->pop_start_state ();
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342)
John W. Eaton <jwe@octave.org>
parents: 17693
diff changeset
934 }
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342)
John W. Eaton <jwe@octave.org>
parents: 17693
diff changeset
935
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342)
John W. Eaton <jwe@octave.org>
parents: 17693
diff changeset
936 %{
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
937 // Double-quoted character strings.
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
938 %}
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
939
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
940 <DQ_STRING_START>\"\" {
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
941 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\"\\\"");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
942
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
943 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
944 curr_lexer->m_string_text += '"';
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
945 }
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
946
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
947 <DQ_STRING_START>\" {
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
948 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\"");
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
949
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
950 // m_tok_beg was set when we started parsing the string.
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
951 curr_lexer->m_tok_end = curr_lexer->m_filepos;
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
952 curr_lexer->m_filepos.increment_column ();
16904
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
953
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
954 curr_lexer->pop_start_state ();
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
955
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
956 if (curr_lexer->start_state() != COMMAND_START)
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
957 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
958 curr_lexer->m_looking_for_object_index = true;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
959 curr_lexer->m_at_beginning_of_statement = false;
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
960
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
961 curr_lexer->push_token (new octave::token (DQ_STRING,
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
962 curr_lexer->m_string_text,
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
963 curr_lexer->m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
964 curr_lexer->m_tok_end));
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
965
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
966 curr_lexer->m_string_text = "";
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
967
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
968 return curr_lexer->count_token_internal (DQ_STRING);
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
969 }
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
970 }
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
971
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
972 <DQ_STRING_START>\\[0-7]{1,3} {
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
973 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\[0-7]{1,3}");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
974
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
975 curr_lexer->update_token_positions (yyleng);
16904
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
976
26450
af7faef288ad lex.ll: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents: 26376
diff changeset
977 unsigned int result;
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
978 sscanf (yytext+1, "%o", &result);
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
979
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
980 if (result > 0xff)
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
981 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
982 // Use location of octal digits for error token.
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
983 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
984 = new octave::token (LEXICAL_ERROR,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
985 "invalid octal escape sequence in character string",
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
986 curr_lexer->m_tok_beg, curr_lexer->m_tok_end);
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
987
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
988 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
989
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
990 return curr_lexer->count_token_internal (LEXICAL_ERROR);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
991 }
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
992 else
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
993 curr_lexer->m_string_text += static_cast<unsigned char> (result);
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
994 }
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
995
17244
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775)
Mike Miller <mtmiller@ieee.org>
parents: 16914
diff changeset
996 <DQ_STRING_START>\\x[0-9a-fA-F]+ {
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775)
Mike Miller <mtmiller@ieee.org>
parents: 16914
diff changeset
997 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\x[0-9a-fA-F]+");
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775)
Mike Miller <mtmiller@ieee.org>
parents: 16914
diff changeset
998
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
999 curr_lexer->m_filepos.increment_column (yyleng);
17244
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775)
Mike Miller <mtmiller@ieee.org>
parents: 16914
diff changeset
1000
26450
af7faef288ad lex.ll: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents: 26376
diff changeset
1001 unsigned int result;
17244
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775)
Mike Miller <mtmiller@ieee.org>
parents: 16914
diff changeset
1002 sscanf (yytext+2, "%x", &result);
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775)
Mike Miller <mtmiller@ieee.org>
parents: 16914
diff changeset
1003
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775)
Mike Miller <mtmiller@ieee.org>
parents: 16914
diff changeset
1004 // Truncate the value silently instead of checking the range like
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775)
Mike Miller <mtmiller@ieee.org>
parents: 16914
diff changeset
1005 // we do for octal above. This is to match C/C++ where any number
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775)
Mike Miller <mtmiller@ieee.org>
parents: 16914
diff changeset
1006 // of digits is allowed but the value is implementation-defined if
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775)
Mike Miller <mtmiller@ieee.org>
parents: 16914
diff changeset
1007 // it exceeds the range of the character type.
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1008 curr_lexer->m_string_text += static_cast<unsigned char> (result);
17244
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775)
Mike Miller <mtmiller@ieee.org>
parents: 16914
diff changeset
1009 }
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775)
Mike Miller <mtmiller@ieee.org>
parents: 16914
diff changeset
1010
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1011 <DQ_STRING_START>"\\a" {
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1012 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\a\"");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1013
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1014 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1015 curr_lexer->m_string_text += '\a';
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1016 }
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1017
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1018 <DQ_STRING_START>"\\b" {
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1019 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\b\"");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1020
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1021 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1022 curr_lexer->m_string_text += '\b';
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1023 }
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1024
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1025 <DQ_STRING_START>"\\f" {
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1026 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\f\"");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1027
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1028 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1029 curr_lexer->m_string_text += '\f';
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1030 }
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1031
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1032 <DQ_STRING_START>"\\n" {
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1033 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\n\"");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1034
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1035 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1036 curr_lexer->m_string_text += '\n';
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1037 }
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1038
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1039 <DQ_STRING_START>"\\r" {
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1040 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\r\"");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1041
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1042 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1043 curr_lexer->m_string_text += '\r';
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1044 }
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1045
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1046 <DQ_STRING_START>"\\t" {
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1047 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\t\"");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1048
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1049 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1050 curr_lexer->m_string_text += '\t';
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1051 }
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1052
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1053 <DQ_STRING_START>"\\v" {
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1054 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\v\"");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1055
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1056 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1057 curr_lexer->m_string_text += '\v';
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1058 }
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1059
18428
4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415).
Stefan Mahr <dac922@gmx.de>
parents: 18319
diff changeset
1060 <DQ_STRING_START>(\.\.\.){S}*{NL} {
4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415).
Stefan Mahr <dac922@gmx.de>
parents: 18319
diff changeset
1061 curr_lexer->lexer_debug ("<DQ_STRING_START>(\\.\\.\\.){S}*{NL}");
16914
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1062
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1063 static const char *msg = "'...' continuations in double-quoted character strings are obsolete and will not be allowed in a future version of Octave; please use '\\' instead";
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1064
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1065 std::string nm = curr_lexer->m_fcn_file_full_name;
16914
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1066
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1067 if (nm.empty ())
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1068 warning_with_id ("Octave:deprecated-syntax", "%s", msg);
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1069 else
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1070 warning_with_id ("Octave:deprecated-syntax",
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1071 "%s; near line %d of file '%s'", msg,
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1072 curr_lexer->m_filepos.line (), nm.c_str ());
16914
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1073
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1074 HANDLE_STRING_CONTINUATION;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1075 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1076
18428
4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415).
Stefan Mahr <dac922@gmx.de>
parents: 18319
diff changeset
1077 <DQ_STRING_START>\\{S}+{NL} {
4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415).
Stefan Mahr <dac922@gmx.de>
parents: 18319
diff changeset
1078 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\{S}+{NL}");
16914
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1079
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1080 static const char *msg = "white space and comments after continuation markers in double-quoted character strings are obsolete and will not be allowed in a future version of Octave";
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1081
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1082 std::string nm = curr_lexer->m_fcn_file_full_name;
16914
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1083
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1084 if (nm.empty ())
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1085 warning_with_id ("Octave:deprecated-syntax", "%s", msg);
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1086 else
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1087 warning_with_id ("Octave:deprecated-syntax",
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1088 "%s; near line %d of file '%s'", msg,
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1089 curr_lexer->m_filepos.line (), nm.c_str ());
16914
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1090
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1091 HANDLE_STRING_CONTINUATION;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1092 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1093
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1094 <DQ_STRING_START>\\{NL} {
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1095 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\{NL}");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1096
16914
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1097 HANDLE_STRING_CONTINUATION;
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1098 }
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1099
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1100 <DQ_STRING_START>\\. {
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1101 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\.");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1102
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1103 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1104 curr_lexer->m_string_text += yytext[1];
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1105 }
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1106
16914
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1107 <DQ_STRING_START>\. {
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1108 curr_lexer->lexer_debug ("<DQ_STRING_START>\\.");
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1109
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1110 curr_lexer->m_filepos.increment_column ();
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1111 curr_lexer->m_string_text += yytext[0];
16914
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1112 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1113
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1114 <DQ_STRING_START>[^\.\\\r\n\"]+ {
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings
John W. Eaton <jwe@octave.org>
parents: 16904
diff changeset
1115 curr_lexer->lexer_debug ("<DQ_STRING_START>[^\\.\\\\\\r\\n\\\"]+");
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1116
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1117 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1118 curr_lexer->m_string_text += yytext;
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1119 }
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1120
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1121 <DQ_STRING_START>{NL} {
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1122 curr_lexer->lexer_debug ("<DQ_STRING_START>{NL}");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1123
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1124 // Use current file position for error token.
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
1125 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
1126 = new octave::token (LEXICAL_ERROR,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
1127 "unterminated character string constant",
27769
07ffed9878ad store begin and end position in tokens
John W. Eaton <jwe@octave.org>
parents: 27768
diff changeset
1128 curr_lexer->m_filepos, curr_lexer->m_filepos);
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1129
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1130 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1131
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1132 curr_lexer->m_filepos.next_line ();
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1133
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1134 return curr_lexer->count_token_internal (LEXICAL_ERROR);
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1135 }
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1136
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1137 %{
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1138 // Single-quoted character strings.
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1139 %}
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1140
16904
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1141 <SQ_STRING_START>\'\' {
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1142 curr_lexer->lexer_debug ("<SQ_STRING_START>\\'\\'");
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1143
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1144 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1145 curr_lexer->m_string_text += '\'';
16904
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1146 }
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1147
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1148 <SQ_STRING_START>\' {
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1149 curr_lexer->lexer_debug ("<SQ_STRING_START>\\'");
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1150
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1151 // m_tok_beg was set when we started parsing the string.
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1152 curr_lexer->m_tok_end = curr_lexer->m_filepos;
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1153 curr_lexer->m_filepos.increment_column ();
16904
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1154
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1155 curr_lexer->pop_start_state ();
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1156
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
1157 if (curr_lexer->start_state() != COMMAND_START)
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
1158 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1159 curr_lexer->m_looking_for_object_index = true;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1160 curr_lexer->m_at_beginning_of_statement = false;
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
1161
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
1162 curr_lexer->push_token (new octave::token (SQ_STRING,
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1163 curr_lexer->m_string_text,
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1164 curr_lexer->m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1165 curr_lexer->m_tok_end));
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1166
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1167 curr_lexer->m_string_text = "";
18224
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
1168
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
1169 return curr_lexer->count_token_internal (SQ_STRING);
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032)
Michael C. Grant <mcg@cvxr.com>
parents: 18139
diff changeset
1170 }
16904
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1171 }
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1172
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1173 <SQ_STRING_START>[^\'\n\r]+ {
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1174 curr_lexer->lexer_debug ("<SQ_STRING_START>[^\\'\\n\\r]+");
f29dd5a7591d more tweaks for parsing character strings
John W. Eaton <jwe@octave.org>
parents: 16903
diff changeset
1175
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1176 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1177 curr_lexer->m_string_text += yytext;
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1178 }
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1179
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1180 <SQ_STRING_START>{NL} {
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1181 curr_lexer->lexer_debug ("<SQ_STRING_START>{NL}");
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1182
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1183 // Use current file position for error token.
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
1184 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
1185 = new octave::token (LEXICAL_ERROR,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
1186 "unterminated character string constant",
27769
07ffed9878ad store begin and end position in tokens
John W. Eaton <jwe@octave.org>
parents: 27768
diff changeset
1187 curr_lexer->m_filepos, curr_lexer->m_filepos);
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1188
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1189 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1190
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1191 curr_lexer->m_filepos.next_line ();
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1192
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1193 return curr_lexer->count_token_internal (LEXICAL_ERROR);
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1194 }
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1195
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1196 %{
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1197 // Fully-qualified identifiers (used for classdef).
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1198 %}
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1199
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1200 <FQ_IDENT_START>{FQIDENT} {
26708
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
1201 curr_lexer->lexer_debug ("<FQ_IDENT_START>{FQIDENT}{S}*");
27052
44d1fe403c19 eliminate mysterious newline output (bug #44934)
John W. Eaton <jwe@octave.org>
parents: 26899
diff changeset
1202
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1203 curr_lexer->pop_start_state ();
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1204
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1205 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1206
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1207 int id_tok = curr_lexer->handle_fq_identifier ();
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1208
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1209 if (id_tok >= 0)
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1210 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1211 curr_lexer->m_looking_for_object_index = true;
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1212
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1213 return curr_lexer->count_token_internal (id_tok);
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1214 }
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1215 }
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1216
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1217 <FQ_IDENT_START>{S}+ {
27052
44d1fe403c19 eliminate mysterious newline output (bug #44934)
John W. Eaton <jwe@octave.org>
parents: 26899
diff changeset
1218 curr_lexer->lexer_debug ("<FQ_IDENT_START>{S}+");
44d1fe403c19 eliminate mysterious newline output (bug #44934)
John W. Eaton <jwe@octave.org>
parents: 26899
diff changeset
1219
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1220 curr_lexer->m_filepos.increment_column (yyleng);
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1221
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1222 curr_lexer->mark_previous_token_trailing_space ();
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1223 }
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1224
27052
44d1fe403c19 eliminate mysterious newline output (bug #44934)
John W. Eaton <jwe@octave.org>
parents: 26899
diff changeset
1225 <FQ_IDENT_START>(\.\.\.){ANY_EXCEPT_NL}*{NL} {
44d1fe403c19 eliminate mysterious newline output (bug #44934)
John W. Eaton <jwe@octave.org>
parents: 26899
diff changeset
1226 curr_lexer->lexer_debug ("<FQ_IDENT_START>(\\.\\.\\.){ANY_EXCEPT_NL}*{NL}");
44d1fe403c19 eliminate mysterious newline output (bug #44934)
John W. Eaton <jwe@octave.org>
parents: 26899
diff changeset
1227
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1228 curr_lexer->m_filepos.next_line ();
27052
44d1fe403c19 eliminate mysterious newline output (bug #44934)
John W. Eaton <jwe@octave.org>
parents: 26899
diff changeset
1229 }
44d1fe403c19 eliminate mysterious newline output (bug #44934)
John W. Eaton <jwe@octave.org>
parents: 26899
diff changeset
1230
44d1fe403c19 eliminate mysterious newline output (bug #44934)
John W. Eaton <jwe@octave.org>
parents: 26899
diff changeset
1231 <FQ_IDENT_START>{ANY_INCLUDING_NL} {
44d1fe403c19 eliminate mysterious newline output (bug #44934)
John W. Eaton <jwe@octave.org>
parents: 26899
diff changeset
1232 curr_lexer->lexer_debug ("<FQ_IDENT_START>{ANY_INCLUDING_NL}");
44d1fe403c19 eliminate mysterious newline output (bug #44934)
John W. Eaton <jwe@octave.org>
parents: 26899
diff changeset
1233
26708
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
1234 // If input doesn't match FQIDENT, return char and go to previous
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
1235 // start state.
27052
44d1fe403c19 eliminate mysterious newline output (bug #44934)
John W. Eaton <jwe@octave.org>
parents: 26899
diff changeset
1236
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1237 yyless (0);
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1238 curr_lexer->pop_start_state ();
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1239 }
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18497
diff changeset
1240
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1241 {BINARY_NUMBER} {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1242 HANDLE_NUMBER ("{BINARY_NUMBER}", 2);
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1243 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1244
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1245 %{
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1246 // Decimal numbers. For expressions that are just digits followed
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1247 // directly by an element-by-element operator, don't grab the '.'
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1248 // part of the operator as part of the constant (for example, in an
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1249 // expression like "13./x").
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1250 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1251
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1252 {DECIMAL_DIGITS}/\.[\*/\\^\'] |
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1253 {DECIMAL_NUMBER} {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1254 HANDLE_NUMBER ("{DECIMAL_DIGITS}/\\.[\\*/\\\\^\\']|{DECIMAL_NUMBER}", 10);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1255 }
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1256
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1257 {HEXADECIMAL_NUMBER} {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
1258 HANDLE_NUMBER ("{HEXADECIMAL_NUMBER}", 16);
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1259 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1260
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1261 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1262 // 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
1263 // the <MATRIX_START> start state code above.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1264 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1265
16363
d16c255299c0 recognize block comment begin while processing line comments (bug #38559)
John W. Eaton <jwe@octave.org>
parents: 16361
diff changeset
1266 {S}+ {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1267 curr_lexer->m_filepos.increment_column (yyleng);
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1268
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
1269 curr_lexer->mark_previous_token_trailing_space ();
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1270 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1271
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1272 %{
17247
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1273 // Continuation lines. Allow arbitrary text after continuations.
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1274 %}
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1275
18311
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281)
John W. Eaton <jwe@octave.org>
parents: 18246
diff changeset
1276 \.\.\.{ANY_EXCEPT_NL}*{NL} {
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281)
John W. Eaton <jwe@octave.org>
parents: 18246
diff changeset
1277 curr_lexer->lexer_debug ("\\.\\.\\.{ANY_EXCEPT_NL}*{NL}");
17247
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1278
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1279 curr_lexer->handle_continuation ();
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1280 }
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1281
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1282 %{
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1283 // Deprecated C preprocessor style continuation markers.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1284 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1285
17246
8be8a65d3ca8 Ignore anything after the continuation marker '...' (bug #38653)
Stefan Mahr <dac922@gmx.de>
parents: 17244
diff changeset
1286 \\{S}*{NL} |
18311
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281)
John W. Eaton <jwe@octave.org>
parents: 18246
diff changeset
1287 \\{S}*{CCHAR}{ANY_EXCEPT_NL}*{NL} {
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281)
John W. Eaton <jwe@octave.org>
parents: 18246
diff changeset
1288 curr_lexer->lexer_debug ("\\\\{S}*{NL}|\\\\{S}*{CCHAR}{ANY_EXCEPT_NL}*{NL}");
17247
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1289
22505
7bdc80232cdc Expand warning for '\' continuation marker to recommend "..." (bug #48810).
Rik <rik@octave.org>
parents: 22323
diff changeset
1290 static const char *msg = "using continuation marker \\ outside of double quoted strings is deprecated and will be removed from a future version of Octave, use ... instead";
17247
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1291
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1292 std::string nm = curr_lexer->m_fcn_file_full_name;
17247
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1293
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1294 if (nm.empty ())
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1295 warning_with_id ("Octave:deprecated-syntax", "%s", msg);
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1296 else
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1297 warning_with_id ("Octave:deprecated-syntax",
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings.
John W. Eaton <jwe@octave.org>
parents: 17246
diff changeset
1298 "%s; near line %d of file '%s'", msg,
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1299 curr_lexer->m_filepos.line (), nm.c_str ());
17343
6470a113eae2 correctly handle deprecated \ continuation markers
John W. Eaton <jwe@octave.org>
parents: 17247
diff changeset
1300
6470a113eae2 correctly handle deprecated \ continuation markers
John W. Eaton <jwe@octave.org>
parents: 17247
diff changeset
1301 curr_lexer->handle_continuation ();
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1302 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1303
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1304 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1305 // End of file.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1306 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1307
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1308 <<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
1309 return curr_lexer->handle_end_of_input ();
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1310 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1311
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1312 %{
16259
0b5ab09dfce4 2/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
1313 // Identifiers.
18394
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords.
John W. Eaton <jwe@octave.org>
parents: 18341
diff changeset
1314
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords.
John W. Eaton <jwe@octave.org>
parents: 18341
diff changeset
1315 // Don't allow get and set to be recognized as keywords if they are
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords.
John W. Eaton <jwe@octave.org>
parents: 18341
diff changeset
1316 // followed by "(".
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1317 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1318
21705
764e586dca4b Avoid use of REJECT in parser (bug #45947).
Rik <rik@octave.org>
parents: 21635
diff changeset
1319 (set|get){S}*\( {
21722
fb5dd9f7d697 * oct-parse.in.yy: Correct pattern string in call to HANDLE_IDENTIFIER.
John W. Eaton <jwe@octave.org>
parents: 21705
diff changeset
1320 HANDLE_IDENTIFIER ("(set|get){S}*\\(", true);
18394
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords.
John W. Eaton <jwe@octave.org>
parents: 18341
diff changeset
1321 }
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords.
John W. Eaton <jwe@octave.org>
parents: 18341
diff changeset
1322
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1323 {IDENT} {
18394
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords.
John W. Eaton <jwe@octave.org>
parents: 18341
diff changeset
1324 HANDLE_IDENTIFIER ("{IDENT}", false);
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1325 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1326
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1327 %{
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1328 // Superclass method identifiers.
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1329 %}
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1330
26708
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
1331 {FQIDENT}{S}*@{S}*{FQIDENT} {
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
1332 curr_lexer->lexer_debug ("{FQIDENT}{S}*@{S}*{FQIDENT}");
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1333
16680
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1334 if (curr_lexer->previous_token_may_be_command ())
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1335 {
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1336 yyless (0);
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1337 curr_lexer->push_start_state (COMMAND_START);
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1338 }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1339 else
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1340 {
26899
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1341 if (curr_lexer->m_at_beginning_of_statement)
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1342 {
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1343 std::string txt = yytext;
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1344
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1345 size_t at_or_dot_pos = txt.find_first_of ("@.");
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1346
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1347 if (at_or_dot_pos != std::string::npos)
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1348 {
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1349 size_t spc_pos = txt.find_first_of (" \t");
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1350
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1351 if (spc_pos != std::string::npos && spc_pos < at_or_dot_pos)
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1352 {
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1353 yyless (spc_pos);
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1354 curr_lexer->m_filepos.increment_column (spc_pos);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1355
26899
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1356 return curr_lexer->handle_identifier ();
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1357 }
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1358 }
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1359 }
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891)
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
1360
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1361 curr_lexer->m_looking_for_object_index = true;
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1362 curr_lexer->m_at_beginning_of_statement = false;
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1363
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1364 return curr_lexer->handle_superclass_identifier ();
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1365 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1366 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1367
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1368 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1369 // Metaclass query
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1370 %}
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1371
26708
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
1372 \?{S}*{FQIDENT} {
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
1373 curr_lexer->lexer_debug ("\\?{S}*{FQIDENT}");
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1374
16680
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1375 if (curr_lexer->previous_token_may_be_command ()
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1376 && curr_lexer->space_follows_previous_token ())
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1377 {
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1378 yyless (0);
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1379 curr_lexer->push_start_state (COMMAND_START);
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1380 }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1381 else
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1382 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1383 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1384
16680
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1385 int id_tok = curr_lexer->handle_meta_identifier ();
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1386
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1387 if (id_tok >= 0)
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1388 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1389 curr_lexer->m_looking_for_object_index = true;
16680
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1390
16683
e1c6ad54259f maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16645 16681
diff changeset
1391 return curr_lexer->count_token_internal (id_tok);
16680
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1392 }
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1393 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1394 }
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1395
26740
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1396 \@ |
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1397 \@{S}*{FQIDENT} {
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1398 curr_lexer->lexer_debug ("\\@|\\@{S}*{FQIDENT}");
18492
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1399
16334
06aa4c0f2018 handle foo @... as command syntax
John W. Eaton <jwe@octave.org>
parents: 16325
diff changeset
1400 if (curr_lexer->previous_token_may_be_command ()
06aa4c0f2018 handle foo @... as command syntax
John W. Eaton <jwe@octave.org>
parents: 16325
diff changeset
1401 && curr_lexer->space_follows_previous_token ())
06aa4c0f2018 handle foo @... as command syntax
John W. Eaton <jwe@octave.org>
parents: 16325
diff changeset
1402 {
06aa4c0f2018 handle foo @... as command syntax
John W. Eaton <jwe@octave.org>
parents: 16325
diff changeset
1403 yyless (0);
06aa4c0f2018 handle foo @... as command syntax
John W. Eaton <jwe@octave.org>
parents: 16325
diff changeset
1404 curr_lexer->push_start_state (COMMAND_START);
06aa4c0f2018 handle foo @... as command syntax
John W. Eaton <jwe@octave.org>
parents: 16325
diff changeset
1405 }
06aa4c0f2018 handle foo @... as command syntax
John W. Eaton <jwe@octave.org>
parents: 16325
diff changeset
1406 else
06aa4c0f2018 handle foo @... as command syntax
John W. Eaton <jwe@octave.org>
parents: 16325
diff changeset
1407 {
26740
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1408 int tok_val = curr_lexer->previous_token_value ();
18492
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1409
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1410 if (curr_lexer->whitespace_is_significant ()
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1411 && curr_lexer->space_follows_previous_token ()
26740
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1412 && ! (tok_val == '[' || tok_val == '{'
18492
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1413 || curr_lexer->previous_token_is_binop ()))
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1414 {
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1415 yyless (0);
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1416 unput (',');
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1417 }
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1418 else
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1419 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1420 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1421
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1422 curr_lexer->m_at_beginning_of_statement = false;
18492
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1423
26740
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1424 std::string ident = yytext;
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1425
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1426 if (ident == "@")
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1427 {
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1428 curr_lexer->m_looking_at_function_handle++;
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1429 curr_lexer->m_looking_for_object_index = false;
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1430
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1431 return curr_lexer->count_token ('@');
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1432 }
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1433 else
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1434 {
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1435 ident = ident.substr (1);
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1436 ident.erase (std::remove_if (ident.begin (), ident.end (),
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1437 is_space_or_tab), ident.end ());
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1438
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1439 octave::token *tok;
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1440
28156
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
1441 if (octave::iskeyword (ident))
26740
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1442 tok = new octave::token (LEXICAL_ERROR,
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1443 "function handles may not refer to keywords",
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1444 curr_lexer->m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1445 curr_lexer->m_tok_end);
26740
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1446 else
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1447 {
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1448 curr_lexer->m_looking_for_object_index = true;
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1449
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1450 tok = new octave::token (FCN_HANDLE, ident,
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1451 curr_lexer->m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1452 curr_lexer->m_tok_end);
26740
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1453 }
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1454
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1455 curr_lexer->push_token (tok);
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1456
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1457 return curr_lexer->count_token_internal (tok->token_value ());
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
1458 }
18492
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569)
Mike Miller <mtmiller@ieee.org>
parents: 18428
diff changeset
1459 }
16334
06aa4c0f2018 handle foo @... as command syntax
John W. Eaton <jwe@octave.org>
parents: 16325
diff changeset
1460 }
4342
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
1461 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
1462
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4323
diff changeset
1463 %{
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1464 // 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
1465 // 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
1466 // 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
1467 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1468
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1469 {NL} {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1470 curr_lexer->lexer_debug ("{NL}");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1471
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1472 if (curr_lexer->m_nesting_level.is_paren ())
16309
e608de76742c allow newline to terminate anonymous function definition
John W. Eaton <jwe@octave.org>
parents: 16299
diff changeset
1473 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1474 curr_lexer->m_filepos.next_line ();
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1475
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1476 curr_lexer->m_at_beginning_of_statement = false;
21102
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX.
Rik <rik@octave.org>
parents: 21100
diff changeset
1477 curr_lexer->warn_language_extension
16309
e608de76742c allow newline to terminate anonymous function definition
John W. Eaton <jwe@octave.org>
parents: 16299
diff changeset
1478 ("bare newline inside parentheses");
e608de76742c allow newline to terminate anonymous function definition
John W. Eaton <jwe@octave.org>
parents: 16299
diff changeset
1479 }
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1480 else if (curr_lexer->m_nesting_level.none ()
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1481 || curr_lexer->m_nesting_level.is_anon_fcn_body ())
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
1482 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1483 curr_lexer->update_token_positions (yyleng);
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1484 curr_lexer->m_filepos.next_line ();
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1485
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1486 curr_lexer->m_at_beginning_of_statement = true;
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1487
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1488 return curr_lexer->count_token ('\n');
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
1489 }
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1490 else if (curr_lexer->m_nesting_level.is_bracket_or_brace ())
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1491 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1492 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1493 curr_lexer->m_filepos.next_line ();
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1494
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1495 // Use current file position for error token.
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
1496 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
1497 = new octave::token (LEXICAL_ERROR,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
1498 "unexpected internal lexer error",
27769
07ffed9878ad store begin and end position in tokens
John W. Eaton <jwe@octave.org>
parents: 27768
diff changeset
1499 curr_lexer->m_filepos, curr_lexer->m_filepos);
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1500
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1501 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1502
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1503 return curr_lexer->count_token_internal (LEXICAL_ERROR);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1504 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1505 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1506
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1507 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1508 // 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
1509 // operator.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1510 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1511
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1512 "'" {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1513 curr_lexer->lexer_debug ("'");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1514
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1515 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
1516 && curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1517 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1518 curr_lexer->m_filepos.increment_column ();
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1519 curr_lexer->push_start_state (COMMAND_START);
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1520 curr_lexer->begin_string (SQ_STRING_START);
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1521 }
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1522 else if (curr_lexer->m_at_beginning_of_statement)
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16680
diff changeset
1523 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1524 curr_lexer->m_filepos.increment_column ();
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1525 curr_lexer->begin_string (SQ_STRING_START);
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16680
diff changeset
1526 }
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1527 else
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1528 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1529 int tok = curr_lexer->previous_token_value ();
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1530
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1531 if (curr_lexer->whitespace_is_significant ())
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1532 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1533 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
1534 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1535 if (tok == '[' || tok == '{'
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1536 || curr_lexer->previous_token_is_binop ())
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1537 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1538 curr_lexer->m_filepos.increment_column ();
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1539 curr_lexer->begin_string (SQ_STRING_START);
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1540 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1541 else
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1542 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1543 yyless (0);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1544 curr_lexer->xunput (',');
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1545 }
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1546 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1547 else
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1548 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1549 if (tok == '[' || tok == '{'
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1550 || curr_lexer->previous_token_is_binop ()
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1551 || curr_lexer->previous_token_is_keyword ())
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1552 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1553 curr_lexer->m_filepos.increment_column ();
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1554 curr_lexer->begin_string (SQ_STRING_START);
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1555 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1556 else
25719
e3c612c0b744 track column count in one more place in lexer
John W. Eaton <jwe@octave.org>
parents: 25708
diff changeset
1557 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1558 curr_lexer->m_filepos.increment_column ();
25719
e3c612c0b744 track column count in one more place in lexer
John W. Eaton <jwe@octave.org>
parents: 25708
diff changeset
1559 return curr_lexer->count_token (HERMITIAN);
e3c612c0b744 track column count in one more place in lexer
John W. Eaton <jwe@octave.org>
parents: 25708
diff changeset
1560 }
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1561 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1562 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1563 else
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1564 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1565 if (! tok || tok == '[' || tok == '{' || tok == '('
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1566 || curr_lexer->previous_token_is_binop ()
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1567 || curr_lexer->previous_token_is_keyword ())
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1568 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1569 curr_lexer->m_filepos.increment_column ();
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1570 curr_lexer->begin_string (SQ_STRING_START);
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1571 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1572 else
25719
e3c612c0b744 track column count in one more place in lexer
John W. Eaton <jwe@octave.org>
parents: 25708
diff changeset
1573 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1574 curr_lexer->m_filepos.increment_column ();
25719
e3c612c0b744 track column count in one more place in lexer
John W. Eaton <jwe@octave.org>
parents: 25708
diff changeset
1575 return curr_lexer->count_token (HERMITIAN);
e3c612c0b744 track column count in one more place in lexer
John W. Eaton <jwe@octave.org>
parents: 25708
diff changeset
1576 }
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1577 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1578 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1579 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1580
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1581 %{
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
1582 // Double quotes always begin strings.
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
1583 %}
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
1584
973
46673c918034 [project @ 1994-12-12 17:50:07 by jwe]
jwe
parents: 972
diff changeset
1585 \" {
16903
f21194531877 improve character string handling in the lexer
John W. Eaton <jwe@octave.org>
parents: 16898
diff changeset
1586 curr_lexer->lexer_debug ("\\\"");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1587
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1588 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
1589 && curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1590 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1591 curr_lexer->m_filepos.increment_column ();
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1592 curr_lexer->push_start_state (COMMAND_START);
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1593 curr_lexer->begin_string (DQ_STRING_START);
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1594 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1595 else
16261
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
1596 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1597 int tok = curr_lexer->previous_token_value ();
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1598
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1599 if (curr_lexer->whitespace_is_significant ())
16261
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
1600 {
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1601 if (curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1602 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1603 if (tok == '[' || tok == '{'
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1604 || curr_lexer->previous_token_is_binop ())
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1605 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1606 curr_lexer->m_filepos.increment_column ();
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1607 curr_lexer->begin_string (DQ_STRING_START);
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1608 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1609 else
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1610 {
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1611 yyless (0);
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1612 curr_lexer->xunput (',');
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1613 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1614 }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1615 else
16261
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
1616 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1617 curr_lexer->m_filepos.increment_column ();
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1618 curr_lexer->begin_string (DQ_STRING_START);
16261
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
1619 }
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
1620 }
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
1621 else
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
1622 {
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1623 curr_lexer->m_filepos.increment_column ();
16898
531473481084 rewrite string parsing to avoid unlimited lookahead
John W. Eaton <jwe@octave.org>
parents: 16788
diff changeset
1624 curr_lexer->begin_string (DQ_STRING_START);
16261
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
1625 }
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
1626 }
b45a90cdb0ae 3/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
1627 }
971
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
1628
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe]
jwe
parents: 970
diff changeset
1629 %{
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1630 // Other operators.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1631 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1632
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1633 ":" { CMD_OR_OP (":", ':', true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1634 ".+" { CMD_OR_OP (".+", EPLUS, false); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1635 ".-" { CMD_OR_OP (".-", EMINUS, false); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1636 ".*" { CMD_OR_OP (".*", EMUL, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1637 "./" { CMD_OR_OP ("./", EDIV, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1638 ".\\" { CMD_OR_OP (".\\", ELEFTDIV, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1639 ".^" { CMD_OR_OP (".^", EPOW, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1640 ".**" { CMD_OR_OP (".**", EPOW, false); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1641 "<=" { CMD_OR_OP ("<=", EXPR_LE, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1642 "==" { CMD_OR_OP ("==", EXPR_EQ, true); }
27975
6931d95d1967 Use "!=" in preference to "~=" everywhere in code.
Rik <rik@octave.org>
parents: 27925
diff changeset
1643 "!=" { CMD_OR_OP ("!=", EXPR_NE, false); }
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1644 "~=" { CMD_OR_OP ("~=", EXPR_NE, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1645 ">=" { CMD_OR_OP (">=", EXPR_GE, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1646 "&" { CMD_OR_OP ("&", EXPR_AND, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1647 "|" { CMD_OR_OP ("|", EXPR_OR, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1648 "<" { CMD_OR_OP ("<", EXPR_LT, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1649 ">" { CMD_OR_OP (">", EXPR_GT, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1650 "*" { CMD_OR_OP ("*", '*', true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1651 "/" { CMD_OR_OP ("/", '/', true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1652
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1653 %{
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1654 // In Matlab, '\' may also trigger command syntax.
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1655 %}
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1656
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1657 "\\" {
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1658 curr_lexer->lexer_debug ("\\");
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1659
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1660 return curr_lexer->handle_op (LEFTDIV);
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1661 }
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1662
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1663 "^" { CMD_OR_OP ("^", POW, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1664 "**" { CMD_OR_OP ("**", POW, false); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1665 "&&" { CMD_OR_OP ("&&", EXPR_AND_AND, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1666 "||" { CMD_OR_OP ("||", EXPR_OR_OR, true); }
16265
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1667
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1668 ";" {
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1669 curr_lexer->lexer_debug (";");
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1670
16265
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1671 bool at_beginning_of_statement
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1672 = (! (curr_lexer->whitespace_is_significant ()
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1673 || curr_lexer->m_looking_at_object_index.front ()));
16265
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1674
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1675 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
1676 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1677
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1678 "+" { CMD_OR_UNARY_OP ("+", '+', true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1679 "-" { CMD_OR_UNARY_OP ("-", '-', true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1680
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1681 "~" { CMD_OR_UNARY_OP ("~", EXPR_NOT, true); }
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1682 "!" { 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
1683
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1684 "," {
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1685 curr_lexer->lexer_debug (",");
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1686
16265
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1687 bool at_beginning_of_statement
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1688 = (! (curr_lexer->whitespace_is_significant ()
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1689 || curr_lexer->m_looking_at_object_index.front ()));
16265
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1690
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1691 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
1692 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1693
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1694 ".'" {
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1695 curr_lexer->lexer_debug (".'");
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1696
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1697 return curr_lexer->handle_op (TRANSPOSE);
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1698 }
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1699
16680
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1700 "++" { CMD_OR_UNARY_OP ("++", PLUS_PLUS, false); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1701 "--" { CMD_OR_UNARY_OP ("--", MINUS_MINUS, false); }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1702
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1703 "(" {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1704 curr_lexer->lexer_debug ("(");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1705
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1706 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1707
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1708 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1709
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1710 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1711 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1712 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1713 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1714
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1715 if (! (tok == '[' || tok == '{'
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1716 || curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1717 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1718 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1719
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1720 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1721 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1722 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1723 curr_lexer->xunput (',');
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1724 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1725 else
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1726 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1727 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1728
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1729 // If we are looking for an object index, then push TRUE for
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1730 // m_looking_at_object_index. Otherwise, just push whatever state
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1731 // 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
1732 // the matching close paren).
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1733
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1734 curr_lexer->m_looking_at_object_index.push_front
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1735 (curr_lexer->m_looking_for_object_index);
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1736
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1737 curr_lexer->m_looking_at_indirect_ref = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1738 curr_lexer->m_looking_for_object_index = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1739 curr_lexer->m_at_beginning_of_statement = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1740
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1741 curr_lexer->m_nesting_level.paren ();
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1742
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1743 return curr_lexer->handle_token ('(');
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1744 }
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1745 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1746
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1747 ")" {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1748 curr_lexer->lexer_debug (")");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1749
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1750 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1751
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1752 curr_lexer->m_nesting_level.remove ();
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1753
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1754 curr_lexer->m_looking_at_object_index.pop_front ();
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1755
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1756 curr_lexer->m_looking_for_object_index = true;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1757 curr_lexer->m_at_beginning_of_statement = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1758
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1759 if (curr_lexer->m_looking_at_anon_fcn_args)
16265
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1760 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1761 curr_lexer->m_looking_at_anon_fcn_args = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1762 curr_lexer->m_nesting_level.anon_fcn_body ();
16265
71ee3afedb69 5/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16263
diff changeset
1763 }
13237
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists.
John W. Eaton <jwe@octave.org>
parents: 12801
diff changeset
1764
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1765 return curr_lexer->count_token (')');
967
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1766 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe]
jwe
parents: 947
diff changeset
1767
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1768 "." {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1769 curr_lexer->lexer_debug (".");
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1770
16325
fc565603ccbb also accept "." as possibly beginning a command
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1771 if (curr_lexer->previous_token_may_be_command ()
fc565603ccbb also accept "." as possibly beginning a command
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1772 && curr_lexer->space_follows_previous_token ())
fc565603ccbb also accept "." as possibly beginning a command
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1773 {
fc565603ccbb also accept "." as possibly beginning a command
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1774 yyless (0);
fc565603ccbb also accept "." as possibly beginning a command
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1775 curr_lexer->push_start_state (COMMAND_START);
fc565603ccbb also accept "." as possibly beginning a command
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1776 }
fc565603ccbb also accept "." as possibly beginning a command
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1777 else
fc565603ccbb also accept "." as possibly beginning a command
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1778 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1779 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1780
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1781 curr_lexer->m_looking_for_object_index = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1782 curr_lexer->m_at_beginning_of_statement = false;
16325
fc565603ccbb also accept "." as possibly beginning a command
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1783
fc565603ccbb also accept "." as possibly beginning a command
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1784 return curr_lexer->handle_token ('.');
fc565603ccbb also accept "." as possibly beginning a command
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1785 }
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
1786 }
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1787
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1788 %{
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1789 // = and op= operators.
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1790 %}
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1791
16360
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16337
diff changeset
1792 "=" {
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1793 curr_lexer->lexer_debug ("=");
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1794
16360
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16337
diff changeset
1795 curr_lexer->maybe_mark_previous_token_as_variable ();
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16337
diff changeset
1796
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
1797 return curr_lexer->handle_op ('=');
16360
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16337
diff changeset
1798 }
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16337
diff changeset
1799
16680
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1800 "+=" { CMD_OR_COMPUTED_ASSIGN_OP ("+=", ADD_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1801 "-=" { CMD_OR_COMPUTED_ASSIGN_OP ("-=", SUB_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1802 "*=" { CMD_OR_COMPUTED_ASSIGN_OP ("*=", MUL_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1803 "/=" { CMD_OR_COMPUTED_ASSIGN_OP ("/=", DIV_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1804 "\\=" { CMD_OR_COMPUTED_ASSIGN_OP ("\\=", LEFTDIV_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1805 ".+=" { CMD_OR_COMPUTED_ASSIGN_OP (".+=", ADD_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1806 ".-=" { CMD_OR_COMPUTED_ASSIGN_OP (".-=", SUB_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1807 ".*=" { CMD_OR_COMPUTED_ASSIGN_OP (".*=", EMUL_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1808 "./=" { CMD_OR_COMPUTED_ASSIGN_OP ("./=", EDIV_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1809 ".\\=" { CMD_OR_COMPUTED_ASSIGN_OP (".\\=", ELEFTDIV_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1810 "^=" { CMD_OR_COMPUTED_ASSIGN_OP ("^=", POW_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1811 "**=" { CMD_OR_COMPUTED_ASSIGN_OP ("^=", POW_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1812 ".^=" { CMD_OR_COMPUTED_ASSIGN_OP (".^=", EPOW_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1813 ".**=" { CMD_OR_COMPUTED_ASSIGN_OP (".^=", EPOW_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1814 "&=" { CMD_OR_COMPUTED_ASSIGN_OP ("&=", AND_EQ); }
de79cdbbdf7c improve parsing of commands
John W. Eaton <jwe@octave.org>
parents: 16643
diff changeset
1815 "|=" { CMD_OR_COMPUTED_ASSIGN_OP ("|=", OR_EQ); }
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1816
16275
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1817 %{
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1818 // In Matlab, '{' may also trigger command syntax.
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1819 %}
dd7de0345124 10/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1820
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1821 "{" {
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
1822 curr_lexer->lexer_debug ("{");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1823
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1824 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1825
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1826 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1827 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1828 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1829 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1830
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1831 if (! (tok == '[' || tok == '{'
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1832 || curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1833 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1834 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1835
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1836 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1837 {
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1838 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1839 curr_lexer->xunput (',');
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1840 }
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1841 else
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1842 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1843 curr_lexer->m_nesting_level.brace ();
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1844
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1845 curr_lexer->m_looking_at_object_index.push_front
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1846 (curr_lexer->m_looking_for_object_index);
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1847
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1848 curr_lexer->m_filepos.increment_column (yyleng);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1849 curr_lexer->m_looking_for_object_index = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1850 curr_lexer->m_at_beginning_of_statement = false;
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1851
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1852 curr_lexer->m_braceflag++;
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1853
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1854 curr_lexer->push_start_state (MATRIX_START);
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1855
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1856 return curr_lexer->count_token ('{');
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16261
diff changeset
1857 }
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1858 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1859
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1860 "}" {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1861 curr_lexer->lexer_debug ("}");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1862
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1863 curr_lexer->update_token_positions (yyleng);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1864
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1865 curr_lexer->m_looking_at_object_index.pop_front ();
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1866
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1867 curr_lexer->m_looking_for_object_index = true;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1868 curr_lexer->m_at_beginning_of_statement = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1869
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1870 curr_lexer->m_nesting_level.remove ();
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1871
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1872 return curr_lexer->handle_token ('}');
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1873 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3332
diff changeset
1874
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1875 %{
2066
a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe]
jwe
parents: 2042
diff changeset
1876 // Unrecognized input is a lexical error.
968
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe]
jwe
parents: 967
diff changeset
1877 %}
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1878
2042
31f4f775b8c6 [project @ 1996-03-28 09:06:28 by jwe]
jwe
parents: 1994
diff changeset
1879 . {
16229
7b7b1e4968e8 use functions instead of token return macros in lexer
John W. Eaton <jwe@octave.org>
parents: 16228
diff changeset
1880 curr_lexer->lexer_debug (".");
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1881
16125
96a58f197f93 allow xunput to be called without buffer argument
John W. Eaton <jwe@octave.org>
parents: 16124
diff changeset
1882 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
1883
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class
John W. Eaton <jwe@octave.org>
parents: 16111
diff changeset
1884 int c = curr_lexer->text_yyinput ();
4248
eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe]
jwe
parents: 4241
diff changeset
1885
16294
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
1886 if (c == 1)
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
1887 return -1;
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
1888 else if (c == EOF)
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
1889 return curr_lexer->handle_end_of_input ();
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
1890 else
4240
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
1891 {
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1892 std::ostringstream buf;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1893
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1894 buf << "invalid character '"
25646
4d565baa475e move libinterp/utils functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 25443
diff changeset
1895 << octave::undo_string_escape (static_cast<char> (c))
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1896 << "' (ASCII " << c << ")";
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1897
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
1898 // Use current file position for error token.
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
1899 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23061
diff changeset
1900 = new octave::token (LEXICAL_ERROR, buf.str (),
27769
07ffed9878ad store begin and end position in tokens
John W. Eaton <jwe@octave.org>
parents: 27768
diff changeset
1901 curr_lexer->m_filepos, curr_lexer->m_filepos);
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1902
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1903 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1904
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
1905 curr_lexer->m_filepos.increment_column ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1906
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21055
diff changeset
1907 return curr_lexer->count_token_internal (LEXICAL_ERROR);
4240
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe]
jwe
parents: 4238
diff changeset
1908 }
2066
a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe]
jwe
parents: 2042
diff changeset
1909 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1910
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
1911 %{
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
1912 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
24444
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
1913 // Disable these warnings for flex code.
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
1914 # pragma GCC diagnostic ignored "-Wold-style-cast"
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
1915 # pragma GCC diagnostic ignored "-Wunused-parameter"
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
1916 #endif
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
1917 %}
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
1918
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1919 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1920
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
1921 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
24444
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
1922 // Restore prevailing warning state for remainder of the file.
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives.
John W. Eaton <jwe@octave.org>
parents: 24387
diff changeset
1923 # pragma GCC diagnostic pop
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
1924 #endif
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 20957
diff changeset
1925
19784
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1926 void *
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1927 octave_alloc (yy_size_t size, yyscan_t)
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1928 {
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21912
diff changeset
1929 return std::malloc (size);
19784
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1930 }
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1931
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1932 void *
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1933 octave_realloc (void *ptr, yy_size_t size, yyscan_t)
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1934 {
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21912
diff changeset
1935 return std::realloc (ptr, size);
19784
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1936 }
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1937
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1938 void
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1939 octave_free (void *ptr, yyscan_t)
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1940 {
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21912
diff changeset
1941 std::free (ptr);
19784
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1942 }
a3577622952c avoid some GCC unused parameter warnings
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
1943
8447
adab48231a03 make input_line_number work again
John W. Eaton <jwe@octave.org>
parents: 8312
diff changeset
1944 static void
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1945 display_character (char c)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1946 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1947 if (isgraph (c))
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1948 std::cerr << c;
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1949 else
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1950 switch (c)
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1951 {
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1952 case 0:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1953 std::cerr << "NUL";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1954 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1955
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1956 case 1:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1957 std::cerr << "SOH";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1958 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1959
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1960 case 2:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1961 std::cerr << "STX";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1962 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1963
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1964 case 3:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1965 std::cerr << "ETX";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1966 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1967
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1968 case 4:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1969 std::cerr << "EOT";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1970 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1971
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1972 case 5:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1973 std::cerr << "ENQ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1974 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1975
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1976 case 6:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1977 std::cerr << "ACK";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1978 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1979
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1980 case 7:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1981 std::cerr << "\\a";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1982 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1983
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1984 case 8:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1985 std::cerr << "\\b";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1986 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1987
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1988 case 9:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1989 std::cerr << "\\t";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1990 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1991
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1992 case 10:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1993 std::cerr << "\\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1994 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1995
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1996 case 11:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1997 std::cerr << "\\v";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
1998 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
1999
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2000 case 12:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2001 std::cerr << "\\f";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2002 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2003
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2004 case 13:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2005 std::cerr << "\\r";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2006 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2007
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2008 case 14:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2009 std::cerr << "SO";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2010 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2011
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2012 case 15:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2013 std::cerr << "SI";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2014 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2015
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2016 case 16:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2017 std::cerr << "DLE";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2018 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2019
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2020 case 17:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2021 std::cerr << "DC1";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2022 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2023
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2024 case 18:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2025 std::cerr << "DC2";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2026 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2027
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2028 case 19:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2029 std::cerr << "DC3";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2030 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2031
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2032 case 20:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2033 std::cerr << "DC4";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2034 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2035
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2036 case 21:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2037 std::cerr << "NAK";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2038 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2039
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2040 case 22:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2041 std::cerr << "SYN";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2042 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2043
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2044 case 23:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2045 std::cerr << "ETB";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2046 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2047
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2048 case 24:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2049 std::cerr << "CAN";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2050 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2051
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2052 case 25:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2053 std::cerr << "EM";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2054 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2055
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2056 case 26:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2057 std::cerr << "SUB";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2058 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2059
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2060 case 27:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2061 std::cerr << "ESC";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2062 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2063
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2064 case 28:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2065 std::cerr << "FS";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2066 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2067
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2068 case 29:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2069 std::cerr << "GS";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2070 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2071
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2072 case 30:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2073 std::cerr << "RS";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2074 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2075
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2076 case 31:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2077 std::cerr << "US";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2078 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2079
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2080 case 32:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2081 std::cerr << "SPACE";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2082 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2083
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2084 case 127:
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2085 std::cerr << "DEL";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2086 break;
8535
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2087 }
75e6ab186761 lexer debugging functions
John W. Eaton <jwe@octave.org>
parents: 8504
diff changeset
2088 }
8745
6dc61981d18b better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents: 8701
diff changeset
2089
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2090 DEFUN (iskeyword, args, ,
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
2091 doc: /* -*- texinfo -*-
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
2092 @deftypefn {} {} iskeyword ()
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
2093 @deftypefnx {} {} iskeyword (@var{name})
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
2094 Return true if @var{name} is an Octave keyword.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
2095
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
2096 If @var{name} is omitted, return a list of keywords.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
2097 @seealso{isvarname, exist}
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
2098 @end deftypefn */)
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2099 {
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2100 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2101
20812
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2102 int nargin = args.length ();
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2103
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2104 if (nargin > 1)
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20773
diff changeset
2105 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20773
diff changeset
2106
20812
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2107 if (nargin == 0)
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2108 {
20812
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2109 // Neither set nor get are keywords. See the note in the
26059
da2bbcf1fbcd Deprecate C++ function is_keyword in favor of iskeyword for readability.
Rik <rik@octave.org>
parents: 25994
diff changeset
2110 // iskeyword function for additional details.
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2111
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2112 string_vector lst (TOTAL_KEYWORDS);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2113
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2114 int j = 0;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2115
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2116 for (int i = 0; i < TOTAL_KEYWORDS; i++)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2117 {
20812
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2118 std::string kword = wordlist[i].name;
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2119
28156
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
2120 if (! (kword == "set" || kword == "get"
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
2121 || kword == "enumeration" || kword == "events"
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
2122 || kword == "methods" || kword == "properties"))
20812
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2123 lst[j++] = kword;
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2124 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2125
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2126 lst.resize (j);
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2127
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2128 retval = Cell (lst.sort ());
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2129 }
20812
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2130 else
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2131 {
20812
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2132 std::string name = args(0).xstring_value ("iskeyword: NAME must be a string");
26059
da2bbcf1fbcd Deprecate C++ function is_keyword in favor of iskeyword for readability.
Rik <rik@octave.org>
parents: 25994
diff changeset
2133 retval = octave::iskeyword (name);
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2134 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2135
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2136 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2137 }
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2138
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2139 /*
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2140
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2141 %!assert (iskeyword ("for"))
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2142 %!assert (iskeyword ("fort"), false)
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2143 %!assert (iskeyword ("fft"), false)
20812
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2144 %!assert (iskeyword ("get"), false)
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2145 %!assert (iskeyword ("set"), false)
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2146
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2147 %!error iskeyword ("A", "B")
d9ca869ca124 maint: Clean-up more instances of print_usage().
Rik <rik@octave.org>
parents: 20798
diff changeset
2148 %!error <NAME must be a string> iskeyword (1)
16114
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2149
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2150 */
73a21ade0b6b * lex.ll: Reorder function definitions.
John W. Eaton <jwe@octave.org>
parents: 16113
diff changeset
2151
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2152 namespace octave
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16253
diff changeset
2153 {
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2154 void
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2155 lexical_feedback::symbol_table_context::clear (void)
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2156 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2157 while (! m_frame_stack.empty ())
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2158 m_frame_stack.pop_front ();
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2159 }
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2160
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2161 void
23602
214cb58ccc1c use pointer to scope instead of scope id
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
2162 lexical_feedback::symbol_table_context::pop (void)
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2163 {
23602
214cb58ccc1c use pointer to scope instead of scope id
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
2164 if (empty ())
214cb58ccc1c use pointer to scope instead of scope id
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
2165 panic_impossible ();
214cb58ccc1c use pointer to scope instead of scope id
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
2166
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2167 m_frame_stack.pop_front ();
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2168 }
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2169
24361
8bcfddad15ec use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 24356
diff changeset
2170 symbol_scope
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2171 lexical_feedback::symbol_table_context::curr_scope (void) const
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2172 {
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2173 if (empty ())
27443
075602880383 store ref to interpreter in lexical_feedback and symbol_table_context classes
John W. Eaton <jwe@octave.org>
parents: 27301
diff changeset
2174 return m_interpreter.get_current_scope ();
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2175 else
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2176 return m_frame_stack.front ();
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2177 }
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2178
24361
8bcfddad15ec use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 24356
diff changeset
2179 symbol_scope
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2180 lexical_feedback::symbol_table_context::parent_scope (void) const
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2181 {
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2182 size_t sz = size ();
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2183
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2184 return (sz > 1
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2185 ? m_frame_stack[1]
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2186 : (sz == 1 ? m_frame_stack[0] : symbol_scope ()));
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2187 }
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23555
diff changeset
2188
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2189 lexical_feedback::~lexical_feedback (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2190 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2191 m_tokens.clear ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2192 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2193
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2194 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2195 lexical_feedback::init (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2196 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2197 // The closest paren, brace, or bracket nesting is not an object
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2198 // index.
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2199 m_looking_at_object_index.push_front (false);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2200 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2201
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2202 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2203 lexical_feedback::reset (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2204 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2205 m_end_of_input = false;
26662
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
2206 m_allow_command_syntax = true;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2207 m_at_beginning_of_statement = true;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2208 m_looking_at_anon_fcn_args = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2209 m_looking_at_return_list = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2210 m_looking_at_parameter_list = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2211 m_looking_at_decl_list = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2212 m_looking_at_initializer_expression = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2213 m_looking_at_matrix_or_assign_lhs = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2214 m_looking_for_object_index = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2215 m_looking_at_indirect_ref = false;
27736
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27578
diff changeset
2216 m_parsing_anon_fcn_body = false;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2217 m_parsing_class_method = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2218 m_parsing_classdef = false;
26709
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
2219 m_parsing_classdef_decl = false;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
2220 m_parsing_classdef_superclass = false;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2221 m_maybe_classdef_get_set_method = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2222 m_parsing_classdef_get_method = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2223 m_parsing_classdef_set_method = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2224 m_quote_is_transpose = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2225 m_force_script = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2226 m_reading_fcn_file = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2227 m_reading_script_file = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2228 m_reading_classdef_file = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2229 m_buffer_function_text = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2230 m_bracketflag = 0;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2231 m_braceflag = 0;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2232 m_looping = 0;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2233 m_defining_func = 0;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2234 m_looking_at_function_handle = 0;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2235 m_block_comment_nesting_level = 0;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2236 m_command_arg_paren_count = 0;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2237 m_token_count = 0;
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
2238 m_filepos = filepos ();
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2239 m_tok_beg = filepos ();
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2240 m_tok_end = filepos ();
27768
d6701f835496 use filepos object to store beginning position of character strings
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
2241 m_string_text = "";
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2242 m_current_input_line = "";
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2243 m_comment_text = "";
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2244 m_help_text = "";
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2245 m_function_text = "";
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2246 m_fcn_file_name = "";
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2247 m_fcn_file_full_name = "";
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2248 m_dir_name = "";
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2249 m_package_name = "";
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2250 m_looking_at_object_index.clear ();
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2251 m_looking_at_object_index.push_front (false);
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2252
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2253 while (! m_parsed_function_name.empty ())
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2254 m_parsed_function_name.pop ();
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2255
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2256 m_pending_local_variables.clear ();
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2257 m_symtab_context.clear ();
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2258 m_nesting_level.reset ();
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2259 m_tokens.clear ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2260 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2261
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2262 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2263 lexical_feedback::previous_token_value (void) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2264 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2265 const token *tok = m_tokens.front ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2266 return tok ? tok->token_value () : 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2267 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2268
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2269 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2270 lexical_feedback::previous_token_value_is (int tok_val) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2271 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2272 const token *tok = m_tokens.front ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2273 return tok ? tok->token_value_is (tok_val) : false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2274 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2275
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2276 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2277 lexical_feedback::mark_previous_token_trailing_space (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2278 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2279 token *tok = m_tokens.front ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2280 if (tok && ! previous_token_value_is ('\n'))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2281 tok->mark_trailing_space ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2282 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2283
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2284 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2285 lexical_feedback::space_follows_previous_token (void) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2286 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2287 const token *tok = m_tokens.front ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2288 return tok ? tok->space_follows_token () : false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2289 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2290
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2291 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2292 lexical_feedback::previous_token_is_binop (void) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2293 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2294 int tok = previous_token_value ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2295
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2296 return (tok == '+' || tok == '-' || tok == '@'
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2297 || tok == ',' || tok == ';' || tok == '*' || tok == '/'
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2298 || tok == ':' || tok == '=' || tok == ADD_EQ
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2299 || tok == AND_EQ || tok == DIV_EQ || tok == EDIV
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2300 || tok == EDIV_EQ || tok == ELEFTDIV || tok == ELEFTDIV_EQ
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2301 || tok == EMINUS || tok == EMUL || tok == EMUL_EQ
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2302 || tok == EPOW || tok == EPOW_EQ || tok == EXPR_AND
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2303 || tok == EXPR_AND_AND || tok == EXPR_EQ || tok == EXPR_GE
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2304 || tok == EXPR_GT || tok == EXPR_LE || tok == EXPR_LT
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2305 || tok == EXPR_NE || tok == EXPR_NOT || tok == EXPR_OR
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2306 || tok == EXPR_OR_OR || tok == LEFTDIV || tok == LEFTDIV_EQ
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2307 || tok == MUL_EQ || tok == OR_EQ || tok == POW
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2308 || tok == POW_EQ || tok == SUB_EQ);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2309 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2310
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2311 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2312 lexical_feedback::previous_token_is_keyword (void) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2313 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2314 const token *tok = m_tokens.front ();
26059
da2bbcf1fbcd Deprecate C++ function is_keyword in favor of iskeyword for readability.
Rik <rik@octave.org>
parents: 25994
diff changeset
2315 return tok ? tok->iskeyword () : false;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2316 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2317
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2318 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2319 lexical_feedback::previous_token_may_be_command (void) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2320 {
26662
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
2321 if (! m_allow_command_syntax)
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
2322 return false;
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
2323
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2324 const token *tok = m_tokens.front ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2325 return tok ? tok->may_be_command () : false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2326 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2327
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2328 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2329 lexical_feedback::maybe_mark_previous_token_as_variable (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2330 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2331 token *tok = m_tokens.front ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2332
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2333 if (tok && tok->is_symbol ())
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2334 m_pending_local_variables.insert (tok->symbol_name ());
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2335 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2336
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2337 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2338 lexical_feedback::mark_as_variables (const std::list<std::string>& lst)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2339 {
22872
551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree
Rik <rik@octave.org>
parents: 22857
diff changeset
2340 for (const auto& var : lst)
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2341 m_pending_local_variables.insert (var);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2342 }
16360
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16337
diff changeset
2343 }
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16337
diff changeset
2344
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2345 static bool
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2346 looks_like_copyright (const std::string& s)
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2347 {
27925
cf45351fc7fa avoid parse exception when initial comment block is all whitespace
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
2348 if (s.empty ())
cf45351fc7fa avoid parse exception when initial comment block is all whitespace
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
2349 return false;
cf45351fc7fa avoid parse exception when initial comment block is all whitespace
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
2350
cf45351fc7fa avoid parse exception when initial comment block is all whitespace
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
2351 // Comment characters have been stripped but whitespace
cf45351fc7fa avoid parse exception when initial comment block is all whitespace
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
2352 // (including newlines) remains.
cf45351fc7fa avoid parse exception when initial comment block is all whitespace
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
2353
cf45351fc7fa avoid parse exception when initial comment block is all whitespace
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
2354 size_t offset = s.find_first_not_of (" \t\n\r");
cf45351fc7fa avoid parse exception when initial comment block is all whitespace
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
2355
cf45351fc7fa avoid parse exception when initial comment block is all whitespace
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
2356 return (offset != std::string::npos
cf45351fc7fa avoid parse exception when initial comment block is all whitespace
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
2357 && (s.substr (offset, 9) == "Copyright"
cf45351fc7fa avoid parse exception when initial comment block is all whitespace
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
2358 || s.substr (offset, 6) == "Author"
cf45351fc7fa avoid parse exception when initial comment block is all whitespace
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
2359 || s.substr (offset, 23) == "SPDX-License-Identifier"));
16228
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2360 }
e19b1632d7c1 revamp most comment handling
John W. Eaton <jwe@octave.org>
parents: 16224
diff changeset
2361
23555
9151922777e2 Pick correct help text when shebang is present (bug #51191).
Rik <rik@octave.org>
parents: 23479
diff changeset
2362 static bool
9151922777e2 Pick correct help text when shebang is present (bug #51191).
Rik <rik@octave.org>
parents: 23479
diff changeset
2363 looks_like_shebang (const std::string& s)
9151922777e2 Pick correct help text when shebang is present (bug #51191).
Rik <rik@octave.org>
parents: 23479
diff changeset
2364 {
9151922777e2 Pick correct help text when shebang is present (bug #51191).
Rik <rik@octave.org>
parents: 23479
diff changeset
2365 return ((! s.empty ()) && (s[0] == '!'));
9151922777e2 Pick correct help text when shebang is present (bug #51191).
Rik <rik@octave.org>
parents: 23479
diff changeset
2366 }
9151922777e2 Pick correct help text when shebang is present (bug #51191).
Rik <rik@octave.org>
parents: 23479
diff changeset
2367
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2368 namespace octave
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2369 {
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2370 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2371 base_lexer::input_buffer::fill (const std::string& input, bool eof_arg)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2372 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2373 m_buffer = input;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2374 m_chars_left = m_buffer.length ();
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2375 m_offset = 0;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2376 m_eof = eof_arg;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2377 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2378
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2379 // If BY_LINES is true, return chunks to the lexer line by line.
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2380 int
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2381 base_lexer::input_buffer::copy_chunk (char *buf, size_t max_size,
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2382 bool by_lines)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2383 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2384 static const char * const eol = "\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2385
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2386 size_t len = 0;
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2387 if (by_lines)
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2388 {
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2389 size_t newline_pos = m_buffer.find ('\n', m_offset);
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2390 len = (newline_pos != std::string::npos
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2391 ? newline_pos - m_offset + 1
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2392 : (max_size > m_chars_left ? m_chars_left : max_size));
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2393 }
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2394 else
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2395 len = max_size > m_chars_left ? m_chars_left : max_size;
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2396
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2397 assert (len > 0);
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2398 memcpy (buf, m_buffer.c_str () + m_offset, len);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2399
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2400 m_chars_left -= len;
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2401 m_offset += len;
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2402
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2403 // Make sure the final input returned to the lexer ends with a new
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2404 // line character.
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2405
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2406 if (m_chars_left == 0 && buf[len-1] != '\n')
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2407 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2408 if (len < max_size)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2409 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2410 // There is enough room to plug the newline character in
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2411 // the buffer.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2412 buf[len++] = '\n';
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2413 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2414 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2415 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2416 // There isn't enough room to plug the newline character
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2417 // in BUF so arrange to have it returned on the next call
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2418 // to base_lexer::read.
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2419
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2420 // At this point we've exhausted the original input
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2421 // (m_chars_left is zero) so we can overwrite the initial
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2422 // buffer with a single newline character to be returned on
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2423 // the next call.
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2424
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2425 m_buffer = eol;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2426 m_chars_left = 1;
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
2427 m_offset = 0;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2428 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2429 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2430
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2431 return len;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2432 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2433
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2434 base_lexer::~base_lexer (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2435 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2436 yylex_destroy (m_scanner);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2437 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2438
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2439 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2440 base_lexer::init (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2441 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2442 yylex_init (&m_scanner);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2443
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2444 // Make base_lexer object available through yyextra in
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2445 // flex-generated lexer.
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2446 yyset_extra (this, m_scanner);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2447
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2448 clear_start_state ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2449 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2450
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2451 // Inside Flex-generated functions, yyg is the scanner cast to its real
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2452 // type. Some flex macros that we use in base_lexer member functions
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2453 // (for example, BEGIN) use yyg. If we could perform the actions of
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2454 // these macros with functions instead, we could eliminate the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2455 // OCTAVE_YYG macro.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2456
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2457 #define OCTAVE_YYG \
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2458 struct yyguts_t *yyg = static_cast<struct yyguts_t*> (m_scanner)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2459
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2460 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2461 base_lexer::reset (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2462 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2463 // Start off on the right foot.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2464 clear_start_state ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2465
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2466 m_symtab_context.clear ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2467
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2468 // Only ask for input from stdin if we are expecting interactive
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2469 // input.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2470
27301
a2b1ba6c92d5 eliminate unnecessary application::interative function
John W. Eaton <jwe@octave.org>
parents: 27086
diff changeset
2471 if (m_interpreter.interactive ()
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2472 && ! (m_reading_fcn_file
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2473 || m_reading_classdef_file
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2474 || m_reading_script_file
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2475 || input_from_eval_string ()))
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2476 yyrestart (stdin, m_scanner);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2477
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2478 lexical_feedback::reset ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2479
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2480 m_comment_buf.reset ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2481 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2482
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2483 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2484 base_lexer::prep_for_file (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2485 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2486 m_reading_script_file = true;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2487
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2488 push_start_state (INPUT_FILE_START);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2489 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2490
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2491 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2492 base_lexer::begin_string (int state)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2493 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2494 m_tok_beg = m_filepos;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2495
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2496 push_start_state (state);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2497 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2498
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2499 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2500 base_lexer::handle_end_of_input (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2501 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2502 lexer_debug ("<<EOF>>");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2503
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2504 m_tok_beg = m_filepos;
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2505 m_tok_end = m_filepos;
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2506
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2507 if (m_block_comment_nesting_level != 0)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2508 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2509 warning ("block comment open at end of input");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2510
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2511 if ((m_reading_fcn_file || m_reading_script_file || m_reading_classdef_file)
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2512 && ! m_fcn_file_name.empty ())
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2513 warning ("near line %d of file '%s.m'",
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
2514 m_filepos.line (), m_fcn_file_name.c_str ());
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2515 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2516
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
2517 token *tok_val = new token (END_OF_INPUT, m_tok_beg, m_tok_end);
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
2518
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
2519 push_token (tok_val);
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
2520
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
2521 return count_token_internal (END_OF_INPUT);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2522 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2523
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2524 char *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2525 base_lexer::flex_yytext (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2526 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2527 return yyget_text (m_scanner);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2528 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2529
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2530 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2531 base_lexer::flex_yyleng (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2532 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2533 return yyget_leng (m_scanner);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2534 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2535
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2536 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2537 base_lexer::text_yyinput (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2538 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2539 int c = yyinput (m_scanner);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2540
25443
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
2541 if (debug_flag ())
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2542 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2543 std::cerr << "I: ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2544 display_character (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2545 std::cerr << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2546 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2547
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2548 // Convert CRLF into just LF and single CR into LF.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2549
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2550 if (c == '\r')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2551 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2552 c = yyinput (m_scanner);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2553
25443
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
2554 if (debug_flag ())
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2555 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2556 std::cerr << "I: ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2557 display_character (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2558 std::cerr << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2559 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2560
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2561 if (c != '\n')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2562 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2563 xunput (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2564 c = '\n';
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2565 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2566 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2567
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2568 return c;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2569 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2570
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2571 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2572 base_lexer::xunput (char c, char *buf)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2573 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2574 if (c != EOF)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2575 {
25443
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
2576 if (debug_flag ())
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2577 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2578 std::cerr << "U: ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2579 display_character (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2580 std::cerr << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2581 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2582
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2583 yyunput (c, buf, m_scanner);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2584 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2585 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2586
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2587 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2588 base_lexer::xunput (char c)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2589 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2590 char *yytxt = flex_yytext ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2591
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2592 xunput (c, yytxt);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2593 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2594
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2595 void
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2596 base_lexer::update_token_positions (int tok_len)
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2597 {
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2598 m_tok_beg = m_filepos;
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2599 m_tok_end = m_filepos;
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2600
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2601 if (tok_len > 1)
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2602 m_tok_end.increment_column (tok_len - 1);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2603
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2604 m_filepos.increment_column (tok_len);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2605 }
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2606
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2607 bool
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2608 base_lexer::looking_at_space (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2609 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2610 int c = text_yyinput ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2611 xunput (c);
26710
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
2612 return is_space_or_tab (c);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2613 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2614
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2615 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2616 base_lexer::inside_any_object_index (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2617 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2618 bool retval = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2619
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2620 for (const bool is_obj_idx : m_looking_at_object_index)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2621 {
22872
551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree
Rik <rik@octave.org>
parents: 22857
diff changeset
2622 if (is_obj_idx)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2623 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2624 retval = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2625 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2626 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2627 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2628
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2629 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2630 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2631
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2632 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2633 base_lexer::is_variable (const std::string& name,
26661
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects
John W. Eaton <jwe@octave.org>
parents: 26482
diff changeset
2634 const symbol_scope& /*scope*/)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2635 {
26662
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
2636 return ((m_interpreter.at_top_level ()
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
2637 && m_interpreter.is_variable (name))
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
2638 || (m_pending_local_variables.find (name)
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2639 != m_pending_local_variables.end ()));
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2640 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2641
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2642 int
27771
cd566153edd6 split base_lexer::is_keyword_token into two functions
John W. Eaton <jwe@octave.org>
parents: 27770
diff changeset
2643 base_lexer::make_keyword_token (const std::string& s)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2644 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2645 int slen = s.length ();
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2646
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2647 const octave_kw *kw = octave_kw_hash::in_word_set (s.c_str (), slen);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2648
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2649 if (! kw)
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2650 return 0;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2651
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2652 bool previous_at_bos = m_at_beginning_of_statement;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2653
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2654 // May be reset to true for some token types.
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2655 m_at_beginning_of_statement = false;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2656
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2657 update_token_positions (slen);
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2658
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2659 token *tok_val = nullptr;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2660
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2661 switch (kw->kw_id)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2662 {
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2663 case break_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2664 case catch_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2665 case continue_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2666 case else_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2667 case otherwise_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2668 case return_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2669 case unwind_protect_cleanup_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2670 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2671 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2672
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2673 case persistent_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2674 case global_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2675 m_looking_at_decl_list = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2676 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2677
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2678 case case_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2679 case elseif_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2680 case until_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2681 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2682
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2683 case end_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2684 if (inside_any_object_index ()
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2685 || (m_defining_func
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2686 && ! (m_looking_at_return_list
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2687 || m_parsed_function_name.top ())))
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2688 {
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2689 m_at_beginning_of_statement = previous_at_bos;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2690 return 0;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2691 }
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2692
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2693 tok_val = new token (end_kw, token::simple_end, m_tok_beg, m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2694 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2695 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2696
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2697 case end_try_catch_kw:
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2698 tok_val = new token (end_try_catch_kw, token::try_catch_end, m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2699 m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2700 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2701 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2702
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2703 case end_unwind_protect_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2704 tok_val = new token (end_unwind_protect_kw,
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2705 token::unwind_protect_end, m_tok_beg, m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2706 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2707 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2708
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2709 case endfor_kw:
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2710 tok_val = new token (endfor_kw, token::for_end, m_tok_beg, m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2711 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2712 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2713
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2714 case endfunction_kw:
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2715 tok_val = new token (endfunction_kw, token::function_end, m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2716 m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2717 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2718 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2719
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2720 case endif_kw:
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2721 tok_val = new token (endif_kw, token::if_end, m_tok_beg, m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2722 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2723 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2724
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2725 case endparfor_kw:
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2726 tok_val = new token (endparfor_kw, token::parfor_end, m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2727 m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2728 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2729 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2730
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2731 case endswitch_kw:
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2732 tok_val = new token (endswitch_kw, token::switch_end, m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2733 m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2734 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2735 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2736
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2737 case endwhile_kw:
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2738 tok_val = new token (endwhile_kw, token::while_end, m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2739 m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2740 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2741 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2742
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2743 case endclassdef_kw:
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2744 tok_val = new token (endclassdef_kw, token::classdef_end, m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2745 m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2746 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2747 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2748
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2749 case endenumeration_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2750 tok_val = new token (endenumeration_kw, token::enumeration_end,
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2751 m_tok_beg, m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2752 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2753 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2754
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2755 case endevents_kw:
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2756 tok_val = new token (endevents_kw, token::events_end, m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2757 m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2758 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2759 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2760
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2761 case endmethods_kw:
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2762 tok_val = new token (endmethods_kw, token::methods_end, m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2763 m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2764 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2765 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2766
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2767 case endproperties_kw:
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2768 tok_val = new token (endproperties_kw, token::properties_end, m_tok_beg,
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2769 m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2770 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2771 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2772
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2773 case for_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2774 case parfor_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2775 case while_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2776 m_looping++;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2777 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2778
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2779 case do_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2780 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2781 m_looping++;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2782 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2783
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2784 case try_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2785 case unwind_protect_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2786 m_at_beginning_of_statement = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2787 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2788
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2789 case if_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2790 case switch_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2791 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2792
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2793 case get_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2794 case set_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2795 // 'get' and 'set' are keywords in classdef method
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2796 // declarations.
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2797 if (! m_maybe_classdef_get_set_method)
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2798 {
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2799 m_at_beginning_of_statement = previous_at_bos;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2800 return 0;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2801 }
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2802 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2803
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2804 case enumeration_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2805 case events_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2806 case methods_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2807 case properties_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2808 // 'properties', 'methods' and 'events' are keywords for
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2809 // classdef blocks.
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2810 if (! m_parsing_classdef)
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2811 {
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2812 m_at_beginning_of_statement = previous_at_bos;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2813 return 0;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2814 }
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2815 // fall through ...
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2816
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2817 case classdef_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2818 // 'classdef' is always a keyword.
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2819 if (! m_force_script && m_token_count == 0 && input_from_file ())
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2820 {
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2821 m_reading_classdef_file = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2822 m_reading_script_file = false;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2823 }
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2824 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2825
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2826 case function_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2827 m_defining_func++;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2828 m_parsed_function_name.push (false);
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2829
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2830 if (! m_force_script && m_token_count == 0 && input_from_file ())
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2831 {
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2832 m_reading_fcn_file = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2833 m_reading_script_file = false;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2834 }
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2835
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2836 if (! (m_reading_fcn_file || m_reading_script_file
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2837 || m_reading_classdef_file))
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2838 {
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2839 // Input must be coming from the terminal or stdin?
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2840 m_buffer_function_text = true;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2841 m_function_text += (m_current_input_line + "\n");
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2842
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2843 // FIXME: do we need to save and restore the file position
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2844 // or just reset the line number here? The goal is to
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2845 // track line info for command-line functions relative
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2846 // to the function keyword.
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2847
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2848 m_filepos = filepos ();
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2849 update_token_positions (slen);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2850 }
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2851 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2852
28517
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676).
Rik <rik@octave.org>
parents: 28407
diff changeset
2853 case spmd_kw:
28522
a5541f5a78dd make parsing of spmd and endspmd keywords work properly (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
2854 m_at_beginning_of_statement = true;
28517
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676).
Rik <rik@octave.org>
parents: 28407
diff changeset
2855 break;
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676).
Rik <rik@octave.org>
parents: 28407
diff changeset
2856
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676).
Rik <rik@octave.org>
parents: 28407
diff changeset
2857 case endspmd_kw:
28522
a5541f5a78dd make parsing of spmd and endspmd keywords work properly (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
2858 tok_val = new token (endspmd_kw, token::spmd_end, m_tok_beg, m_tok_end);
28517
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676).
Rik <rik@octave.org>
parents: 28407
diff changeset
2859 m_at_beginning_of_statement = true;
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676).
Rik <rik@octave.org>
parents: 28407
diff changeset
2860 break;
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676).
Rik <rik@octave.org>
parents: 28407
diff changeset
2861
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2862 case magic_file_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2863 {
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2864 if ((m_reading_fcn_file || m_reading_script_file
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2865 || m_reading_classdef_file)
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2866 && ! m_fcn_file_full_name.empty ())
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2867 tok_val = new token (magic_file_kw, m_fcn_file_full_name,
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2868 m_tok_beg, m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2869 else
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2870 tok_val = new token (magic_file_kw, "stdin", m_tok_beg, m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2871 }
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2872 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2873
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2874 case magic_line_kw:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2875 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2876 int l = m_tok_beg.line ();
28582
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
2877 octave_value ov_value (static_cast<double> (l));
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
2878 tok_val = new token (magic_line_kw, ov_value, "",
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
2879 m_tok_beg, m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2880 }
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2881 break;
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2882
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2883 default:
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2884 panic_impossible ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2885 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2886
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2887 if (! tok_val)
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
2888 tok_val = new token (kw->tok, true, m_tok_beg, m_tok_end);
27770
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2889
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2890 push_token (tok_val);
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2891
7a06e352ac61 style fix
John W. Eaton <jwe@octave.org>
parents: 27769
diff changeset
2892 return kw->tok;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2893 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2894
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2895 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2896 base_lexer::fq_identifier_contains_keyword (const std::string& s)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2897 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2898 size_t p1 = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2899 size_t p2;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2900
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2901 std::string s_part;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2902
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2903 do
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2904 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2905 p2 = s.find ('.', p1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2906
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2907 if (p2 != std::string::npos)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2908 {
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2909 s_part = s.substr (p1, p2 - p1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2910 p1 = p2 + 1;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
2911 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2912 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2913 s_part = s.substr (p1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2914
28156
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
2915 if (iskeyword (s_part))
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2916 return true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2917 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2918 while (p2 != std::string::npos);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2919
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2920 return false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2921 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2922
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2923 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2924 base_lexer::whitespace_is_significant (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2925 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2926 return (m_nesting_level.is_bracket ()
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2927 || (m_nesting_level.is_brace ()
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
2928 && ! m_looking_at_object_index.front ()));
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2929 }
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2930 }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
2931
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2932 static inline bool
20589
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'.
Rik <rik@octave.org>
parents: 20588
diff changeset
2933 looks_like_bin (const char *s, int len)
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'.
Rik <rik@octave.org>
parents: 20588
diff changeset
2934 {
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'.
Rik <rik@octave.org>
parents: 20588
diff changeset
2935 return (len > 2 && s[0] == '0' && (s[1] == 'b' || s[1] == 'B'));
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'.
Rik <rik@octave.org>
parents: 20588
diff changeset
2936 }
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'.
Rik <rik@octave.org>
parents: 20588
diff changeset
2937
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'.
Rik <rik@octave.org>
parents: 20588
diff changeset
2938 static inline bool
3220
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2939 looks_like_hex (const char *s, int len)
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2940 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2941 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
2942 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe]
jwe
parents: 3208
diff changeset
2943
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2944 static inline octave_value
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2945 make_integer_value (uintmax_t long_int_val, bool unsigned_val, int bytes)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2946 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2947 if (unsigned_val)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2948 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2949 switch (bytes)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2950 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2951 case 1:
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2952 return octave_value (octave_uint8 (long_int_val));
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2953
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2954 case 2:
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2955 return octave_value (octave_uint16 (long_int_val));
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2956
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2957 case 4:
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2958 return octave_value (octave_uint32 (long_int_val));
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2959
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2960 case 8:
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2961 return octave_value (octave_uint64 (long_int_val));
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2962
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2963 default:
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2964 panic_impossible ();
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2965 };
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2966 }
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2967 else
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2968 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2969 // FIXME: Conversion to signed values is supposed to follow
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2970 // twos-complement rules. Do we need to be more carefule here?
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2971
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2972 switch (bytes)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2973 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2974 case 1:
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2975 return octave_value (octave_int8 (int8_t (long_int_val)));
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2976
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2977 case 2:
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2978 return octave_value (octave_int16 (int16_t (long_int_val)));
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2979
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2980 case 4:
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2981 return octave_value (octave_int32 (int32_t (long_int_val)));
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2982
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2983 case 8:
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2984 return octave_value (octave_int64 (int64_t (long_int_val)));
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2985
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2986 default:
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2987 panic_impossible ();
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2988 };
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2989 }
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2990
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2991 return octave_value ();
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2992 }
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2993
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2994 namespace octave
4037
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe]
jwe
parents: 4018
diff changeset
2995 {
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2996 template <>
28565
0ecec070c086 return token ID directly from base_lexer::handle_number
John W. Eaton <jwe@octave.org>
parents: 28522
diff changeset
2997 int
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
2998 base_lexer::handle_number<2> (void)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2999 {
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3000 // Skip 0[bB] prefix.
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3001 std::string yytxt (flex_yytext () + 2);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3002
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3003 yytxt.erase (std::remove (yytxt.begin (), yytxt.end (), '_'),
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3004 yytxt.end ());
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3005
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3006 size_t pos = yytxt.find_first_of ("su");
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3007
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3008 bool unsigned_val = true;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3009 int bytes = -1;
28586
703458652e30 lex.ll (base_lexer::handle_number): Eliminate shadowed variable warnings.
John W. Eaton <jwe@octave.org>
parents: 28583
diff changeset
3010
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3011 if (pos == std::string::npos)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3012 {
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3013 size_t num_digits = yytxt.length ();
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3014
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3015 if (num_digits <= 8)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3016 bytes = 1;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3017 else if (num_digits <= 16)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3018 bytes = 2;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3019 else if (num_digits <= 32)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3020 bytes = 4;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3021 else if (num_digits <= 64)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3022 bytes = 8;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3023 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3024 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3025 {
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3026 unsigned_val = (yytxt[pos] == 'u');
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3027 std::string size_str = yytxt.substr (pos+1);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3028 yytxt = yytxt.substr (0, pos);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3029 size_t num_digits = yytxt.length ();
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3030
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3031 if (size_str == "8" && num_digits <= 8)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3032 bytes = 1;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3033 else if (size_str == "16" && num_digits <= 16)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3034 bytes = 2;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3035 else if (size_str == "32" && num_digits <= 32)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3036 bytes = 4;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3037 else if (size_str == "64" && num_digits <= 64)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3038 bytes = 8;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3039 }
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3040
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3041 if (bytes < 0)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3042 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3043 token *tok
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3044 = new token (LEXICAL_ERROR,
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3045 "too many digits for binary constant",
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3046 m_tok_beg, m_tok_end);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3047
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3048 push_token (tok);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3049
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3050 return count_token_internal (LEXICAL_ERROR);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3051 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3052
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3053 // FIXME: is there a better way? Can uintmax_t be anything other
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3054 // than long or long long? Should we just be using uint64_t instead
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3055 // of uintmax_t?
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3056
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3057 errno = 0;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3058 char *end;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3059 uintmax_t long_int_val;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3060 if (sizeof (uintmax_t) == sizeof (unsigned long long))
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3061 long_int_val = strtoull (yytxt.c_str (), &end, 2);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3062 else if (sizeof (uintmax_t) == sizeof (unsigned long))
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3063 long_int_val = strtoul (yytxt.c_str (), &end, 2);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3064 else
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3065 panic_impossible ();
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3066
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3067 if (errno == ERANGE)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3068 panic_impossible ();
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3069
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3070 octave_value ov_value
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3071 = make_integer_value (long_int_val, unsigned_val, bytes);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3072
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3073 m_looking_for_object_index = false;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3074 m_at_beginning_of_statement = false;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3075
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3076 update_token_positions (flex_yyleng ());
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3077
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3078 push_token (new token (NUMBER, ov_value, yytxt, m_tok_beg, m_tok_end));
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3079
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3080 return count_token_internal (NUMBER);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3081 }
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3082
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3083 template <>
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3084 int
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3085 base_lexer::handle_number<10> (void)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3086 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3087 bool imag = false;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3088
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3089 char *yytxt = flex_yytext ();
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3090 size_t yylng = flex_yyleng ();
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3091
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3092 OCTAVE_LOCAL_BUFFER (char, tmptxt, yylng + 1);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3093 char *rp = yytxt;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3094 char *p = &tmptxt[0];
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3095
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3096 char ch;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3097 while ((ch = *rp++))
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3098 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3099 switch (ch)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3100 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3101 case '_':
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3102 break;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3103
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3104 case 'D':
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3105 case 'd':
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3106 *p++ = 'e';
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3107 break;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3108
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3109 case 'I':
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3110 case 'i':
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3111 case 'J':
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3112 case 'j':
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3113 imag = true;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3114 break;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3115
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3116 default:
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3117 *p++ = ch;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3118 break;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3119 }
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3120 }
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3121
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3122 *p = '\0';
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3123
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3124 double value = 0.0;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3125 int nread = 0;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3126
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3127 nread = sscanf (tmptxt, "%lf", &value);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3128
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3129 // If yytext doesn't contain a valid number, we are in deep doo doo.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3130
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3131 assert (nread == 1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3132
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3133 m_looking_for_object_index = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3134 m_at_beginning_of_statement = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3135
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3136 update_token_positions (yylng);
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3137
28582
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
3138 octave_value ov_value
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
3139 = imag ? octave_value (Complex (0.0, value)) : octave_value (value);
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
3140
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
3141 push_token (new token (NUMBER, ov_value, yytxt, m_tok_beg, m_tok_end));
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
3142
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
3143 return count_token_internal (NUMBER);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3144 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3145
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3146 template <>
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3147 int
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3148 base_lexer::handle_number<16> (void)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3149 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3150 // Skip 0[xX] prefix.
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3151 std::string yytxt (flex_yytext () + 2);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3152
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3153 yytxt.erase (std::remove (yytxt.begin (), yytxt.end (), '_'),
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3154 yytxt.end ());
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3155
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3156 size_t pos = yytxt.find_first_of ("su");
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3157
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3158 bool unsigned_val = true;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3159 int bytes = -1;
28586
703458652e30 lex.ll (base_lexer::handle_number): Eliminate shadowed variable warnings.
John W. Eaton <jwe@octave.org>
parents: 28583
diff changeset
3160
703458652e30 lex.ll (base_lexer::handle_number): Eliminate shadowed variable warnings.
John W. Eaton <jwe@octave.org>
parents: 28583
diff changeset
3161 if (pos == std::string::npos)
28583
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3162 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3163 size_t num_digits = yytxt.length ();
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3164
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3165 if (num_digits <= 2)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3166 bytes = 1;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3167 else if (num_digits <= 4)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3168 bytes = 2;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3169 else if (num_digits <= 8)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3170 bytes = 4;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3171 else if (num_digits <= 16)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3172 bytes = 8;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3173 }
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3174 else
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3175 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3176 unsigned_val = (yytxt[pos] == 'u');
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3177 std::string size_str = yytxt.substr (pos+1);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3178 yytxt = yytxt.substr (0, pos);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3179 size_t num_digits = yytxt.length ();
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3180
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3181 if (size_str == "8" && num_digits <= 2)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3182 bytes = 1;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3183 else if (size_str == "16" && num_digits <= 4)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3184 bytes = 2;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3185 else if (size_str == "32" && num_digits <= 8)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3186 bytes = 4;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3187 else if (size_str == "64" && num_digits <= 16)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3188 bytes = 8;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3189 }
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3190
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3191 if (bytes < 0)
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3192 {
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3193 token *tok
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3194 = new token (LEXICAL_ERROR,
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3195 "too many digits for hexadecimal constant",
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3196 m_tok_beg, m_tok_end);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3197
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3198 push_token (tok);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3199
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3200 return count_token_internal (LEXICAL_ERROR);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3201 }
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3202
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3203 // Assert here because if yytext doesn't contain a valid number, we
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3204 // are in deep doo doo.
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3205
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3206 uintmax_t long_int_val;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3207 assert (sscanf (yytxt.c_str (), "%jx", &long_int_val));
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3208
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3209 octave_value ov_value
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3210 = make_integer_value (long_int_val, unsigned_val, bytes);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3211
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3212 m_looking_for_object_index = false;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3213 m_at_beginning_of_statement = false;
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3214
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3215 update_token_positions (flex_yyleng ());
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3216
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3217 push_token (new token (NUMBER, ov_value, yytxt, m_tok_beg, m_tok_end));
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3218
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3219 return count_token_internal (NUMBER);
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3220 }
96e7dc4c2214 improve Matlab compatibility for binary and hexadecimal constants
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
3221
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3222 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3223 base_lexer::handle_continuation (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3224 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3225 char *yytxt = flex_yytext ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3226 int yylng = flex_yyleng ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3227
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3228 int offset = 1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3229 if (yytxt[0] == '\\')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3230 warn_language_extension_continuation ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3231 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3232 offset = 3;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3233
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3234 bool have_space = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3235 while (offset < yylng)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3236 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3237 char c = yytxt[offset];
26710
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
3238 if (is_space_or_tab (c))
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3239 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3240 have_space = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3241 offset++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3242 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3243 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3244 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3245 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3246
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3247 if (have_space)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3248 mark_previous_token_trailing_space ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3249
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3250 bool have_comment = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3251 while (offset < yylng)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3252 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3253 char c = yytxt[offset];
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3254 if (c == '#' || c == '%')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3255 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3256 have_comment = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3257 offset++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3258 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3259 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3260 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3261 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3262
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3263 if (have_comment)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3264 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3265 m_comment_text = &yytxt[offset];
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3266
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3267 // finish_comment sets m_at_beginning_of_statement to true but
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3268 // that's not be correct if we are handling a continued
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3269 // statement. Preserve the current state.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3270
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3271 bool saved_bos = m_at_beginning_of_statement;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3272
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3273 finish_comment (comment_elt::end_of_line);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3274
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3275 m_at_beginning_of_statement = saved_bos;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3276 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3277
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
3278 m_filepos.next_line ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3279 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3280
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3281 void
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3282 base_lexer::finish_comment (comment_elt::comment_type typ)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3283 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3284 bool copyright = looks_like_copyright (m_comment_text);
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3285
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3286 if (m_nesting_level.none () && m_help_text.empty () && ! m_comment_text.empty ()
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3287 && ! copyright && ! looks_like_shebang (m_comment_text))
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3288 m_help_text = m_comment_text;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3289
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3290 if (copyright)
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3291 typ = comment_elt::copyright;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3292
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3293 m_comment_buf.append (m_comment_text, typ);
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3294
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3295 m_comment_text = "";
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3296
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3297 m_at_beginning_of_statement = true;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3298 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3299
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3300 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3301 base_lexer::handle_close_bracket (int bracket_type)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3302 {
25708
ca38400776bc track column count in lexer in a few more places (bug #34852)
John W. Eaton <jwe@octave.org>
parents: 25646
diff changeset
3303 m_looking_at_object_index.pop_front ();
ca38400776bc track column count in lexer in a few more places (bug #34852)
John W. Eaton <jwe@octave.org>
parents: 25646
diff changeset
3304
ca38400776bc track column count in lexer in a few more places (bug #34852)
John W. Eaton <jwe@octave.org>
parents: 25646
diff changeset
3305 m_looking_for_object_index = true;
ca38400776bc track column count in lexer in a few more places (bug #34852)
John W. Eaton <jwe@octave.org>
parents: 25646
diff changeset
3306 m_at_beginning_of_statement = false;
ca38400776bc track column count in lexer in a few more places (bug #34852)
John W. Eaton <jwe@octave.org>
parents: 25646
diff changeset
3307
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3308 if (! m_nesting_level.none ())
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3309 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3310 m_nesting_level.remove ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3311
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3312 if (bracket_type == ']')
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3313 m_bracketflag--;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3314 else if (bracket_type == '}')
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3315 m_braceflag--;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3316 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3317 panic_impossible ();
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3318 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3319
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3320 pop_start_state ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3321
25708
ca38400776bc track column count in lexer in a few more places (bug #34852)
John W. Eaton <jwe@octave.org>
parents: 25646
diff changeset
3322 return count_token (bracket_type);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3323 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3324
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3325 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3326 base_lexer::looks_like_command_arg (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3327 {
26662
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
3328 if (! m_allow_command_syntax)
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
3329 return false;
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
3330
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3331 bool space_before = space_follows_previous_token ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3332 bool space_after = looking_at_space ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3333
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3334 return (space_before && ! space_after
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3335 && previous_token_may_be_command ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3336 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3337
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3338 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3339 base_lexer::handle_superclass_identifier (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3340 {
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3341 update_token_positions (flex_yyleng ());
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3342
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
3343 std::string txt = flex_yytext ();
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
3344
26708
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3345 txt.erase (std::remove_if (txt.begin (), txt.end (), is_space_or_tab),
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3346 txt.end ());
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3347
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
3348 size_t pos = txt.find ("@");
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
3349
26718
9b0335f4bc74 revise naming of the parts of a superclass reference
John W. Eaton <jwe@octave.org>
parents: 26710
diff changeset
3350 std::string meth = txt.substr (0, pos);
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
3351 std::string cls = txt.substr (pos + 1);
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
3352
28156
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
3353 if (iskeyword (meth) || fq_identifier_contains_keyword (cls))
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3354 {
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3355 token *tok
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3356 = new token (LEXICAL_ERROR,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3357 "method, class, and package names may not be keywords",
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3358 m_tok_beg, m_tok_end);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3359
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3360 push_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3361
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3362 return count_token_internal (LEXICAL_ERROR);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3363 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3364
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3365 push_token (new token (SUPERCLASSREF, meth, cls, m_tok_beg, m_tok_end));
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
3366
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
3367 m_filepos.increment_column (flex_yyleng ());
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3368
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3369 return count_token_internal (SUPERCLASSREF);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3370 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3371
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3372 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3373 base_lexer::handle_meta_identifier (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3374 {
26708
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3375 std::string txt = flex_yytext ();
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3376
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3377 txt.erase (std::remove_if (txt.begin (), txt.end (), is_space_or_tab),
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3378 txt.end ());
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3379
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3380 // Eliminate leading '?'
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3381 std::string cls = txt.substr (1);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3382
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3383 // Token positions should have already been updated before this
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3384 // function is called.
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3385
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3386 if (fq_identifier_contains_keyword (cls))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3387 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3388 token *tok = new token (LEXICAL_ERROR,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3389 "class and package names may not be keywords",
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3390 m_tok_beg, m_tok_end);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3391 push_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3392
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3393 return count_token_internal (LEXICAL_ERROR);
16126
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions
John W. Eaton <jwe@octave.org>
parents: 16125
diff changeset
3394 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3395
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3396 push_token (new token (METAQUERY, cls, m_tok_beg, m_tok_end));
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
3397
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
3398 m_filepos.increment_column (flex_yyleng ());
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3399
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3400 return METAQUERY;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3401 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3402
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3403 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3404 base_lexer::handle_fq_identifier (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3405 {
26708
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3406 std::string txt = flex_yytext ();
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3407
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3408 txt.erase (std::remove_if (txt.begin (), txt.end (), is_space_or_tab),
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3409 txt.end ());
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3410
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3411 // Token positions should have already been updated before this
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3412 // function is called.
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3413
26708
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
3414 if (fq_identifier_contains_keyword (txt))
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3415 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3416 token *tok
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3417 = new token (LEXICAL_ERROR,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3418 "function, method, class, and package names may not be keywords",
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3419 m_tok_beg, m_tok_end);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3420
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3421 push_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3422
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3423 return count_token_internal (LEXICAL_ERROR);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3424 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3425
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3426 push_token (new token (FQ_IDENT, txt, m_tok_beg, m_tok_end));
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
3427
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
3428 m_filepos.increment_column (flex_yyleng ());
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3429
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3430 return FQ_IDENT;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3431 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3432
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3433 // Figure out exactly what kind of token to return when we have seen
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3434 // an identifier. Handles keywords. Return -1 if the identifier
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3435 // should be ignored.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3436
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3437 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3438 base_lexer::handle_identifier (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3439 {
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3440 update_token_positions (flex_yyleng ());
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3441
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3442 std::string ident = flex_yytext ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3443
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3444 // If we are expecting a structure element, avoid recognizing
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3445 // keywords and other special names and return STRUCT_ELT, which is
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3446 // a string that is also a valid identifier.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3447
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3448 if (m_looking_at_indirect_ref)
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3449 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3450 push_token (new token (STRUCT_ELT, ident, m_tok_beg, m_tok_end));
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3451
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3452 m_looking_for_object_index = true;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3453
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3454 return STRUCT_ELT;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3455 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3456
28156
22cddebcb0d0 allow @get and @set to work properly again (bug #57988)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
3457 // If ident is a keyword token, then make_keyword_token will set
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3458 // m_at_beginning_of_statement. For example, if tok is an IF
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3459 // token, then m_at_beginning_of_statement will be false.
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3460
27771
cd566153edd6 split base_lexer::is_keyword_token into two functions
John W. Eaton <jwe@octave.org>
parents: 27770
diff changeset
3461 int kw_token = make_keyword_token (ident);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3462
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3463 // If we have a regular keyword, return it.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3464 // Keywords can be followed by identifiers.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3465
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3466 if (kw_token)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3467 {
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3468 m_looking_for_object_index = false;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3469
27771
cd566153edd6 split base_lexer::is_keyword_token into two functions
John W. Eaton <jwe@octave.org>
parents: 27770
diff changeset
3470 // The call to make_keyword_token set m_at_beginning_of_statement.
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3471
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3472 return count_token_internal (kw_token);
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3473 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3474
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3475 // Find the token in the symbol table.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3476
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3477 symbol_scope scope = m_symtab_context.curr_scope ();
24361
8bcfddad15ec use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 24356
diff changeset
3478
8bcfddad15ec use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 24356
diff changeset
3479 symbol_record sr = (scope ? scope.insert (ident) : symbol_record (ident));
23602
214cb58ccc1c use pointer to scope instead of scope id
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
3480
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3481 token *tok = new token (NAME, sr, m_tok_beg, m_tok_end);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3482
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3483 // The following symbols are handled specially so that things like
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3484 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3485 // pi +1
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3486 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3487 // are parsed as an addition expression instead of as a command-style
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3488 // function call with the argument "+1".
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3489
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3490 if (m_at_beginning_of_statement
27736
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27578
diff changeset
3491 && ! (m_parsing_anon_fcn_body
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27578
diff changeset
3492 || is_variable (ident, scope)
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27578
diff changeset
3493 || ident == "e" || ident == "pi"
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27578
diff changeset
3494 || ident == "I" || ident == "i"
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27578
diff changeset
3495 || ident == "J" || ident == "j"
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27578
diff changeset
3496 || ident == "Inf" || ident == "inf"
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27578
diff changeset
3497 || ident == "NaN" || ident == "nan"))
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3498 tok->mark_may_be_command ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3499
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3500 push_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3501
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3502 // The magic end index can't be indexed.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3503
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3504 if (ident != "end")
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3505 m_looking_for_object_index = true;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3506
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3507 m_at_beginning_of_statement = false;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3508
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3509 return count_token_internal (NAME);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3510 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3511
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3512 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3513 base_lexer::maybe_warn_separator_insert (char sep)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3514 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3515 std::string nm = m_fcn_file_full_name;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3516
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3517 if (nm.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3518 warning_with_id ("Octave:separator-insert",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3519 "potential auto-insertion of '%c' near line %d",
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
3520 sep, m_filepos.line ());
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3521 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3522 warning_with_id ("Octave:separator-insert",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3523 "potential auto-insertion of '%c' near line %d of file %s",
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
3524 sep, m_filepos.line (), nm.c_str ());
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3525 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3526
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3527 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3528 base_lexer::warn_single_quote_string (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3529 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3530 std::string nm = m_fcn_file_full_name;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3531
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3532 if (nm.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3533 warning_with_id ("Octave:single-quote-string",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3534 "single quote delimited string near line %d",
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
3535 m_filepos.line ());
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3536 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3537 warning_with_id ("Octave:single-quote-string",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3538 "single quote delimited string near line %d of file %s",
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
3539 m_filepos.line (), nm.c_str ());
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3540 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3541
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3542 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3543 base_lexer::warn_language_extension (const std::string& msg)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3544 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3545 std::string nm = m_fcn_file_full_name;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3546
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3547 if (nm.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3548 warning_with_id ("Octave:language-extension",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3549 "Octave language extension used: %s",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3550 msg.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3551 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3552 warning_with_id ("Octave:language-extension",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3553 "Octave language extension used: %s near line %d offile %s",
27766
0ca7f17de041 use file position object to track line and column info in lexer and parser
John W. Eaton <jwe@octave.org>
parents: 27760
diff changeset
3554 msg.c_str (), m_filepos.line (), nm.c_str ());
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3555 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3556
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3557 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3558 base_lexer::maybe_warn_language_extension_comment (char c)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3559 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3560 if (c == '#')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3561 warn_language_extension ("# used as comment character");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3562 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3563
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3564 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3565 base_lexer::warn_language_extension_continuation (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3566 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3567 warn_language_extension ("\\ used as line continuation marker");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3568 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3569
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3570 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3571 base_lexer::warn_language_extension_operator (const std::string& op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3572 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3573 std::string t = op;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3574 int n = t.length ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3575 if (t[n-1] == '\n')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3576 t.resize (n-1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3577 warn_language_extension (t + " used as operator");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3578 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3579
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3580 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3581 base_lexer::push_token (token *tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3582 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3583 YYSTYPE *lval = yyget_lval (m_scanner);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3584 lval->tok_val = tok;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3585 m_tokens.push (tok);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3586 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3587
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3588 token *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3589 base_lexer::current_token (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3590 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3591 YYSTYPE *lval = yyget_lval (m_scanner);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3592 return lval->tok_val;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3593 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3594
28264
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
3595 size_t
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
3596 base_lexer::pending_token_count (void) const
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
3597 {
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
3598 return m_tokens.size ();
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
3599 }
d938c4d22200 handle comments in multi-line statements with push parser/lexer (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28262
diff changeset
3600
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3601 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3602 base_lexer::display_token (int tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3603 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3604 switch (tok)
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3605 {
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3606 case '=': std::cerr << "'='\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3607 case ':': std::cerr << "':'\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3608 case '-': std::cerr << "'-'\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3609 case '+': std::cerr << "'+'\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3610 case '*': std::cerr << "'*'\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3611 case '/': std::cerr << "'/'\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3612 case ADD_EQ: std::cerr << "ADD_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3613 case SUB_EQ: std::cerr << "SUB_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3614 case MUL_EQ: std::cerr << "MUL_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3615 case DIV_EQ: std::cerr << "DIV_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3616 case LEFTDIV_EQ: std::cerr << "LEFTDIV_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3617 case POW_EQ: std::cerr << "POW_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3618 case EMUL_EQ: std::cerr << "EMUL_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3619 case EDIV_EQ: std::cerr << "EDIV_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3620 case ELEFTDIV_EQ: std::cerr << "ELEFTDIV_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3621 case EPOW_EQ: std::cerr << "EPOW_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3622 case AND_EQ: std::cerr << "AND_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3623 case OR_EQ: std::cerr << "OR_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3624 case EXPR_AND_AND: std::cerr << "EXPR_AND_AND\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3625 case EXPR_OR_OR: std::cerr << "EXPR_OR_OR\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3626 case EXPR_AND: std::cerr << "EXPR_AND\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3627 case EXPR_OR: std::cerr << "EXPR_OR\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3628 case EXPR_NOT: std::cerr << "EXPR_NOT\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3629 case EXPR_LT: std::cerr << "EXPR_LT\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3630 case EXPR_LE: std::cerr << "EXPR_LE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3631 case EXPR_EQ: std::cerr << "EXPR_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3632 case EXPR_NE: std::cerr << "EXPR_NE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3633 case EXPR_GE: std::cerr << "EXPR_GE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3634 case EXPR_GT: std::cerr << "EXPR_GT\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3635 case LEFTDIV: std::cerr << "LEFTDIV\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3636 case EMUL: std::cerr << "EMUL\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3637 case EDIV: std::cerr << "EDIV\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3638 case ELEFTDIV: std::cerr << "ELEFTDIV\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3639 case EPLUS: std::cerr << "EPLUS\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3640 case EMINUS: std::cerr << "EMINUS\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3641 case HERMITIAN: std::cerr << "HERMITIAN\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3642 case TRANSPOSE: std::cerr << "TRANSPOSE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3643 case PLUS_PLUS: std::cerr << "PLUS_PLUS\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3644 case MINUS_MINUS: std::cerr << "MINUS_MINUS\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3645 case POW: std::cerr << "POW\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3646 case EPOW: std::cerr << "EPOW\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3647
28582
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
3648 case NUMBER:
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3649 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3650 token *tok_val = current_token ();
28582
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
3651 std::cerr << "NUMBER [";
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
3652 octave_value num = tok_val->number ();
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
3653 num.print_raw (std::cerr);
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28565
diff changeset
3654 std::cerr << "]\n";
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3655 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3656 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3657
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3658 case STRUCT_ELT:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3659 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3660 token *tok_val = current_token ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3661 std::cerr << "STRUCT_ELT [" << tok_val->text () << "]\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3662 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3663 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3664
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3665 case NAME:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3666 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3667 token *tok_val = current_token ();
24270
bc3819b7cca1 don't use symbol_table:: nesting for symbol_record, symbol_scope, or fcn_info
John W. Eaton <jwe@octave.org>
parents: 24092
diff changeset
3668 symbol_record sr = tok_val->sym_rec ();
23602
214cb58ccc1c use pointer to scope instead of scope id
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
3669 std::cerr << "NAME [" << sr.name () << "]\n";
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3670 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3671 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3672
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3673 case END: std::cerr << "END\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3674
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3675 case DQ_STRING:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3676 case SQ_STRING:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3677 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3678 token *tok_val = current_token ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3679
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3680 std::cerr << (tok == DQ_STRING ? "DQ_STRING" : "SQ_STRING")
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3681 << " [" << tok_val->text () << "]\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3682 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3683 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3684
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3685 case FOR: std::cerr << "FOR\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3686 case WHILE: std::cerr << "WHILE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3687 case DO: std::cerr << "DO\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3688 case UNTIL: std::cerr << "UNTIL\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3689 case IF: std::cerr << "IF\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3690 case ELSEIF: std::cerr << "ELSEIF\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3691 case ELSE: std::cerr << "ELSE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3692 case SWITCH: std::cerr << "SWITCH\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3693 case CASE: std::cerr << "CASE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3694 case OTHERWISE: std::cerr << "OTHERWISE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3695 case BREAK: std::cerr << "BREAK\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3696 case CONTINUE: std::cerr << "CONTINUE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3697 case FUNC_RET: std::cerr << "FUNC_RET\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3698 case UNWIND: std::cerr << "UNWIND\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3699 case CLEANUP: std::cerr << "CLEANUP\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3700 case TRY: std::cerr << "TRY\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3701 case CATCH: std::cerr << "CATCH\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3702 case GLOBAL: std::cerr << "GLOBAL\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3703 case PERSISTENT: std::cerr << "PERSISTENT\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3704 case FCN_HANDLE: std::cerr << "FCN_HANDLE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3705 case END_OF_INPUT: std::cerr << "END_OF_INPUT\n\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3706 case LEXICAL_ERROR: std::cerr << "LEXICAL_ERROR\n\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3707 case FCN: std::cerr << "FCN\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3708 case INPUT_FILE: std::cerr << "INPUT_FILE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3709 case SUPERCLASSREF: std::cerr << "SUPERCLASSREF\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3710 case METAQUERY: std::cerr << "METAQUERY\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3711 case GET: std::cerr << "GET\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3712 case SET: std::cerr << "SET\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3713 case PROPERTIES: std::cerr << "PROPERTIES\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3714 case METHODS: std::cerr << "METHODS\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3715 case EVENTS: std::cerr << "EVENTS\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3716 case CLASSDEF: std::cerr << "CLASSDEF\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3717 case '\n': std::cerr << "\\n\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3718 case '\r': std::cerr << "\\r\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3719 case '\t': std::cerr << "TAB\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3720 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3721 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3722 if (tok < 256 && tok > 31)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3723 std::cerr << static_cast<char> (tok) << "\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3724 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3725 std::cerr << "UNKNOWN(" << tok << ")\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3726 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3727 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3728 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3729 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3730
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3731 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3732 base_lexer::fatal_error (const char *msg)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3733 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3734 error ("fatal lexer error: %s", msg);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3735 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3736
25443
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3737 bool
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3738 base_lexer::debug_flag (void) const
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3739 {
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3740 settings& stgs = m_interpreter.get_settings ();
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3741 return stgs.lexer_debug_flag ();
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3742 }
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3743
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3744 bool
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3745 base_lexer::display_tokens (void) const
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3746 {
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3747 settings& stgs = m_interpreter.get_settings ();
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3748 return stgs.display_tokens ();
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3749 }
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3750
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3751 void
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3752 base_lexer::increment_token_count (void)
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3753 {
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3754 settings& stgs = m_interpreter.get_settings ();
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3755 stgs.increment_token_count ();
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3756
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3757 m_token_count++;
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3758 }
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3759
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3760 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3761 base_lexer::lexer_debug (const char *pattern)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3762 {
25443
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3763 if (debug_flag ())
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3764 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3765 std::cerr << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3766
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3767 display_start_state ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3768
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3769 std::cerr << "P: " << pattern << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3770 std::cerr << "T: " << flex_yytext () << std::endl;
16119
b31eb56f4d84 maint: reorder class definitions in lex.ll
John W. Eaton <jwe@octave.org>
parents: 16118
diff changeset
3771 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3772 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3773
25994
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents: 25719
diff changeset
3774 bool
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents: 25719
diff changeset
3775 base_lexer::input_from_tmp_history_file (void)
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents: 25719
diff changeset
3776 {
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents: 25719
diff changeset
3777 history_system& history_sys = m_interpreter.get_history_system ();
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents: 25719
diff changeset
3778
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents: 25719
diff changeset
3779 return history_sys.input_from_tmp_file ();
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents: 25719
diff changeset
3780 }
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents: 25719
diff changeset
3781
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3782 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3783 base_lexer::push_start_state (int state)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3784 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3785 OCTAVE_YYG;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3786
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3787 start_state_stack.push (state);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3788
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3789 BEGIN (start_state ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3790 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3791
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3792 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3793 base_lexer::pop_start_state (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3794 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3795 OCTAVE_YYG;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3796
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
3797 start_state_stack.pop ();
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
3798
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3799 BEGIN (start_state ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3800 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3801
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3802 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3803 base_lexer::clear_start_state (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3804 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3805 while (! start_state_stack.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3806 start_state_stack.pop ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3807
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3808 push_start_state (INITIAL);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3809 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3810
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3811 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3812 base_lexer::display_start_state (void) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3813 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3814 std::cerr << "S: ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3815
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3816 switch (start_state ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3817 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3818 case INITIAL:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3819 std::cerr << "INITIAL" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3820 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3821
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3822 case COMMAND_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3823 std::cerr << "COMMAND_START" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3824 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3825
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3826 case MATRIX_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3827 std::cerr << "MATRIX_START" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3828 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3829
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3830 case INPUT_FILE_START:
26709
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3831 std::cerr << "INPUT_FILE_START" << std::endl;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3832 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3833
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3834 case BLOCK_COMMENT_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3835 std::cerr << "BLOCK_COMMENT_START" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3836 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3837
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3838 case LINE_COMMENT_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3839 std::cerr << "LINE_COMMENT_START" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3840 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3841
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3842 case DQ_STRING_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3843 std::cerr << "DQ_STRING_START" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3844 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3845
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3846 case SQ_STRING_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3847 std::cerr << "SQ_STRING_START" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3848 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3849
26709
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3850 case FQ_IDENT_START:
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3851 std::cerr << "FQ_IDENT_START" << std::endl;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3852 break;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3853
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3854 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3855 std::cerr << "UNKNOWN START STATE!" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3856 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3857 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3858 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3859
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3860 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3861 base_lexer::maybe_unput_comma_before_unary_op (int tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3862 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3863 int prev_tok = previous_token_value ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3864
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3865 bool unput_comma = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3866
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3867 if (whitespace_is_significant () && space_follows_previous_token ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3868 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3869 int c = text_yyinput ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3870 xunput (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3871
26710
d6dd07dce2d2 use inline functions for matching whitespace in lexer
John W. Eaton <jwe@octave.org>
parents: 26709
diff changeset
3872 bool space_after = is_space_or_tab (c);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3873
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3874 if (! (prev_tok == '[' || prev_tok == '{'
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3875 || previous_token_is_binop ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3876 || ((tok == '+' || tok == '-') && space_after)))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3877 unput_comma = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3878 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3879
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3880 return unput_comma;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3881 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3882
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3883 int
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3884 base_lexer::handle_op (int tok, bool bos, bool compat)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3885 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3886 if (! compat)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3887 warn_language_extension_operator (flex_yytext ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3888
28149
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3889 update_token_positions (flex_yyleng ());
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3890
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3891 push_token (new token (tok, m_tok_beg, m_tok_end));
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
3892
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3893 m_looking_for_object_index = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3894 m_at_beginning_of_statement = bos;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3895
26709
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3896 switch (tok)
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3897 {
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3898 case EXPR_LT:
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3899 if (m_parsing_classdef_decl)
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3900 {
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3901 m_parsing_classdef_superclass = true;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3902 push_start_state (FQ_IDENT_START);
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3903 }
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3904 break;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3905
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3906 case EXPR_AND:
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3907 if (m_parsing_classdef_superclass)
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3908 push_start_state (FQ_IDENT_START);
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3909 break;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3910
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3911 default:
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3912 break;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3913 }
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26708
diff changeset
3914
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3915 return count_token_internal (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3916 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3917
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
3918 // When a command argument boundary is detected, push out the current
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
3919 // argument being built. This one seems like a good candidate for a
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
3920 // function call.
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
3921
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3922 int
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
3923 base_lexer::finish_command_arg (void)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3924 {
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
3925 int tok = SQ_STRING;
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
3926
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3927 token *tok_val = new token (tok, m_string_text, m_tok_beg, m_tok_end);
27777
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
3928
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
3929 m_string_text = "";
3b6920ee4383 eliminate COMMAND_ARG_FINISH macro in lexer
John W. Eaton <jwe@octave.org>
parents: 27771
diff changeset
3930 m_command_arg_paren_count = 0;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3931
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3932 return handle_token (tok, tok_val);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3933 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3934
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3935 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3936 base_lexer::handle_token (int tok, token *tok_val)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3937 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3938 if (! tok_val)
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3939 tok_val = new token (tok, m_tok_beg, m_tok_end);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3940
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3941 push_token (tok_val);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3942
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3943 return count_token_internal (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3944 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3945
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3946 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3947 base_lexer::count_token (int tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3948 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27777
diff changeset
3949 token *tok_val = new token (tok, m_tok_beg, m_tok_end);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3950
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3951 push_token (tok_val);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3952
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3953 return count_token_internal (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3954 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3955
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3956 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3957 base_lexer::count_token_internal (int tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3958 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3959 if (tok != '\n')
25443
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3960 increment_token_count ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3961
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3962 return show_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3963 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3964
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3965 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3966 base_lexer::show_token (int tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3967 {
25443
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3968
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3969 if (display_tokens ())
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3970 display_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3971
25443
2fa7cd178c4a new class for miscellaneous interpreter settings
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
3972 if (debug_flag ())
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3973 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3974 std::cerr << "R: ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3975 display_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3976 std::cerr << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3977 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3978
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3979 return tok;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3980 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3981
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3982 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3983 lexer::fill_flex_buffer (char *buf, unsigned max_size)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3984 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3985 int status = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3986
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3987 if (m_input_buf.empty ())
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3988 {
27527
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27526
diff changeset
3989 input_system& input_sys = m_interpreter.get_input_system ();
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27526
diff changeset
3990
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27526
diff changeset
3991 std::string ps
27528
e51284fc0a51 eliminate promptflag from the lexer and input reader classes
John W. Eaton <jwe@octave.org>
parents: 27527
diff changeset
3992 = m_initial_input ? input_sys.PS1 () : input_sys.PS2 ();
27527
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27526
diff changeset
3993
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27526
diff changeset
3994 std::string prompt = command_editor::decode_prompt_string (ps);
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27526
diff changeset
3995
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3996 bool eof = false;
27527
73be3c628eac refactor input_reader class and its use in lexer
John W. Eaton <jwe@octave.org>
parents: 27526
diff changeset
3997 m_current_input_line = m_reader.get_input (prompt, eof);
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3998
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
3999 m_input_buf.fill (m_current_input_line, eof);
23730
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4000
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4001 // Attempt to capture text for functions defined on the
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4002 // command line.
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4003 //
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4004 // FIXME: the handling of newline here seems a bit clumsy.
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4005 //
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4006 // See also comments in push_lexer::append_input.
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4007
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
4008 if (m_buffer_function_text)
23730
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4009 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
4010 if (! m_current_input_line.empty ())
23786
10136bfd46a3 lex.ll: Fix heap-buffer-overflow (bug #51533).
Rik <rik@octave.org>
parents: 23750
diff changeset
4011 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
4012 m_function_text += m_current_input_line;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
4013 if (m_current_input_line.back () != '\n')
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
4014 m_function_text += '\n';
23786
10136bfd46a3 lex.ll: Fix heap-buffer-overflow (bug #51533).
Rik <rik@octave.org>
parents: 23750
diff changeset
4015 }
23730
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4016 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4017 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4018
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
4019 if (! m_input_buf.empty ())
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
4020 status = m_input_buf.copy_chunk (buf, max_size);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4021 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4022 status = YY_NULL;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4023
27528
e51284fc0a51 eliminate promptflag from the lexer and input reader classes
John W. Eaton <jwe@octave.org>
parents: 27527
diff changeset
4024 m_initial_input = false;
e51284fc0a51 eliminate promptflag from the lexer and input reader classes
John W. Eaton <jwe@octave.org>
parents: 27527
diff changeset
4025
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4026 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4027 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4028
23730
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4029 void
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4030 push_lexer::append_input (const std::string& input, bool eof)
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4031 {
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4032 // FIXME: input may contain more than one line, so how can we
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4033 // properly start buffering input for command-line functions?
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4034 //
27771
cd566153edd6 split base_lexer::is_keyword_token into two functions
John W. Eaton <jwe@octave.org>
parents: 27770
diff changeset
4035 // Currently, base_lexer::make_keyword_token starts buffering text
23730
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4036 // for command-line functions by setting the initial value of
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
4037 // m_function_text to m_current_input_line when function_kw is
23730
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4038 // recognized. To make that work, we need to do something like
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4039 // maintain a queue of input strings and pass them to the flex
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4040 // buffer one line at a time, while also setting
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
4041 // m_current_input_line. Some care will be needed if a single line
23730
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4042 // of input arrives in multiple calls to append_input.
27512
549273db93e4 cache current input line in push lexer
John W. Eaton <jwe@octave.org>
parents: 27443
diff changeset
4043 //
549273db93e4 cache current input line in push lexer
John W. Eaton <jwe@octave.org>
parents: 27443
diff changeset
4044 // OR, should we require that the input string to append_input
549273db93e4 cache current input line in push lexer
John W. Eaton <jwe@octave.org>
parents: 27443
diff changeset
4045 // IS a single line of input? That seems to be what we are doing
549273db93e4 cache current input line in push lexer
John W. Eaton <jwe@octave.org>
parents: 27443
diff changeset
4046 // here by setting m_current_input_line to input.
23730
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4047
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
4048 m_input_buf.fill (input, eof);
27512
549273db93e4 cache current input line in push lexer
John W. Eaton <jwe@octave.org>
parents: 27443
diff changeset
4049 m_current_input_line = input;
23730
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4050 }
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
4051
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4052 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4053 push_lexer::fill_flex_buffer (char *buf, unsigned max_size)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4054 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4055 int status = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4056
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
4057 if (m_input_buf.empty () && ! m_input_buf.at_eof ())
28112
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4058 {
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4059 // If the input buffer is empty or we are at the end of the
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4060 // buffer, insert ASCII 1 as a marker for subsequent rules.
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4061 // Don't insert a newline character in this case. Instead of
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4062 // calling input_buffer::fill followed immediately by
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4063 // input_buffer::copy_chunk, simply insert the marker directly
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4064 // in BUF.
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4065
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4066 assert (max_size > 0);
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4067
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4068 buf[0] = static_cast<char> (1);
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4069 status = 1;
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4070 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4071 else
28112
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4072 {
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4073 // Note that the copy_chunk function may append a newline
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4074 // character to the input.
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4075
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4076 if (! m_input_buf.empty ())
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28264
diff changeset
4077 status = m_input_buf.copy_chunk (buf, max_size, true);
28112
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4078 else
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4079 status = YY_NULL;
1db62b2d6c39 in push lexer, don't insert NL with ASCII 1 marker (bug #57859)
John W. Eaton <jwe@octave.org>
parents: 27975
diff changeset
4080 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4081
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4082 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4083 }
16224
4a848eb52de2 use stack for tracking lexer start states
John W. Eaton <jwe@octave.org>
parents: 16209
diff changeset
4084 }