octave: libinterp/parse-tree/lex.ll annotate

annotate libinterp/parse-tree/lex.ll @ 27769:07ffed9878ad

store begin and end position in tokens * token.h, token.cc (token::m_beg_pos): Rename from m_pos. (token::m_end_pos): New member variable. (token::beg_pos, token::end_pos): New functions. (token::token): Accept beginning and ending positions for tokens as arguments. Change all uses but store the same position for both beginning and end in most cases. Subsequent changes will store the correct beginning and ending positions.

author	John W. Eaton <jwe@octave.org>
date	Mon, 02 Dec 2019 22:58:55 -0600
parents	d6701f835496
children	7a06e352ac61

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
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	3 Copyright (C) 1993-2019 John W. Eaton
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	4
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24445 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24445 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	10 (at your option) any later version.
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	11
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	15 GNU General Public License for more details.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	16
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6547 diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24445 diff changeset	19 <https://www.gnu.org/licenses/>.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	20
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	21 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	22
16150 891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	23 /*
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	24 We are using the pure parser interface and the reentrant lexer
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	25 interface but the Octave parser and lexer are NOT properly
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	26 reentrant because both still use many global variables. It should be
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	27 safe to create a parser object and call it while another parser
16150 891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	28 object is active (to parse a callback function while the main
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	29 interactive parser is waiting for input, for example) if you take
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	30 care to properly save and restore (typically with an unwind_protect
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	31 object) relevant global values before and after the nested call.
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	32 */
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	33
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	34 %top {
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	35 #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	36 # include "config.h"
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	37 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	38
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	39 #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	40 // This one needs to be global.
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24387 diff changeset	41 # pragma GCC diagnostic ignored "-Wunused-function"
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24387 diff changeset	42 // 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	43 // 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	44 // 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	45 // the bottom of the file.
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24387 diff changeset	46 # pragma GCC diagnostic push
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24387 diff changeset	47 # 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	48 # pragma GCC diagnostic ignored "-Wsign-compare"
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24387 diff changeset	49 # 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	50 # 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	51 # pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24387 diff changeset	52 # endif
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	53 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	54
21332 db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	55 // 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	56 // potential warnings about it.
db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	57 #if ! defined (register)
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	58 # define register
21332 db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	59 #endif
db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	60
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	61 }
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	62
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	63 %option prefix = "octave_"
16146 b6050fc0a2d9 use %option noyywrap John W. Eaton <jwe@octave.org> parents: 16139 diff changeset	64 %option noyywrap
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	65 %option reentrant
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	66 %option bison-bridge
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	67
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	68 %option noyyalloc
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	69 %option noyyrealloc
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	70 %option noyyfree
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	71
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	72 %x COMMAND_START
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	73 %s MATRIX_START
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	74
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	75 %x INPUT_FILE_START
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	76
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	77 %x BLOCK_COMMENT_START
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	78 %x LINE_COMMENT_START
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	79
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	80 %x DQ_STRING_START
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	81 %x SQ_STRING_START
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	82
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	83 %x FQ_IDENT_START
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	84
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	85 %{
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 216 diff changeset	86
1341 e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	87 #include <cctype>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	88 #include <cstring>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	89
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	90 #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	91 #include <set>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5615 diff changeset	92 #include <sstream>
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	93 #include <string>
4214 b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe] jwe parents: 4208 diff changeset	94 #include <stack>
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	95
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2900 diff changeset	96 #include "cmd-edit.h"
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21814 diff changeset	97 #include "lo-mappers.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4131 diff changeset	98 #include "quit.h"
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21814 diff changeset	99 #include "unistd-wrappers.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2900 diff changeset	100
16154 aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment. John W. Eaton <jwe@octave.org> parents: 16150 diff changeset	101 // 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	102 // 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	103 // 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	104 // 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	105 // times.
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	106
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	107 #include "Cell.h"
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2167 diff changeset	108 #include "defun.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	109 #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	110 #include "errwarn.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1341 diff changeset	111 #include "input.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22089 diff changeset	112 #include "interpreter.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	113 #include "lex.h"
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22003 diff changeset	114 #include "octave.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	115 #include "ov.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	116 #include "parse.h"
2987 ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe] jwe parents: 2982 diff changeset	117 #include "pt-all.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	118 #include "symtab.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	119 #include "token.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	120 #include "utils.h"
94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	121 #include "variables.h"
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	122 #include "oct-parse.h"
06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	123 #include "oct-gperf.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	124
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	125 // 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	126 // 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	127 // 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	128 // 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	129 // 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	130 // in the generated oct-parse.h file.
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	131
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	132 #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	133 # define YYSTYPE OCTAVE_STYPE
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	134 #endif
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	135
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21814 diff changeset	136 #define YY_NO_UNISTD_H 1
4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21814 diff changeset	137 #define isatty octave_isatty_wrapper
4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21814 diff changeset	138
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	139 #if ! (defined (FLEX_SCANNER) \
2716 2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	140 && 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	141 && 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	142 #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	143 #endif
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	144
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	145 #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	146 #define curr_lexer yyextra
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	147
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	148 // Arrange to get input via readline.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	149
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	150 #if defined (YY_INPUT)
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	151 # undef YY_INPUT
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	152 #endif
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	153 #define YY_INPUT(buf, result, max_size) \
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	154 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	155
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	156 // 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	157
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	158 #if defined (YY_FATAL_ERROR)
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	159 # undef YY_FATAL_ERROR
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	160 #endif
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	161 #define YY_FATAL_ERROR(msg) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	162 (yyget_extra (yyscanner))->fatal_error (msg)
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	163
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	164 #define CMD_OR_OP(PATTERN, TOK, COMPAT) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	165 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	166 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	167 curr_lexer->lexer_debug (PATTERN); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	168 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	169 if (curr_lexer->looks_like_command_arg ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	170 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	171 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	172 curr_lexer->push_start_state (COMMAND_START); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	173 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	174 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	175 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	176 return curr_lexer->handle_op_internal (TOK, false, COMPAT); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	177 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	178 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	179 while (0)
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	180
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	181 #define CMD_OR_COMPUTED_ASSIGN_OP(PATTERN, TOK) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	182 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	183 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	184 curr_lexer->lexer_debug (PATTERN); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	185 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	186 if (curr_lexer->previous_token_may_be_command () \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	187 && curr_lexer->space_follows_previous_token ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	188 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	189 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	190 curr_lexer->push_start_state (COMMAND_START); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	191 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	192 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	193 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	194 return curr_lexer->handle_language_extension_op (PATTERN, TOK, \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	195 false); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	196 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	197 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	198 while (0)
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	199
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	200 #define CMD_OR_UNARY_OP(PATTERN, TOK, COMPAT) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	201 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	202 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	203 curr_lexer->lexer_debug (PATTERN); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	204 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	205 if (curr_lexer->previous_token_may_be_command ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	206 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	207 if (curr_lexer->looks_like_command_arg ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	208 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	209 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	210 curr_lexer->push_start_state (COMMAND_START); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	211 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	212 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	213 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	214 return curr_lexer->handle_op_internal (TOK, false, COMPAT); \
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 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	217 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	218 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	219 int tok \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	220 = (COMPAT \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	221 ? curr_lexer->handle_unary_op (TOK) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	222 : curr_lexer->handle_language_extension_unary_op (TOK)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	223 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	224 if (tok < 0) \
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 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	227 curr_lexer->xunput (','); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	228 /* Adjust for comma that was not really in the input stream. */ \
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	229 curr_lexer->m_filepos.decrement_column (); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	230 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	231 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	232 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	233 return tok; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	234 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	235 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	236 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	237 while (0)
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	238
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	239 // We can't rely on the trick used elsewhere of sticking ASCII 1 in
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	240 // the input buffer and recognizing it as a special case because ASCII
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	241 // 1 is a valid character for a character string. If we are at the
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	242 // end of the buffer, ask for more input. If we are at the end of the
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	243 // file, deal with it. Otherwise, just keep going with the text from
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	244 // the current buffer.
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	245 #define HANDLE_STRING_CONTINUATION \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	246 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	247 { \
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	248 curr_lexer->m_filepos.next_line (); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	249 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	250 if (curr_lexer->is_push_lexer ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	251 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	252 if (curr_lexer->at_end_of_buffer ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	253 return -1; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	254 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	255 if (curr_lexer->at_end_of_file ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	256 return curr_lexer->handle_end_of_input (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	257 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	258 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	259 while (0)
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	260
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	261 // When a command argument boundary is detected, push out the
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	262 // current argument being built. This one seems like a good
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	263 // candidate for a function call.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	264
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	265 #define COMMAND_ARG_FINISH \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	266 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	267 { \
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	268 if (curr_lexer->m_string_text.empty ()) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	269 break; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	270 \
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	271 int retval = curr_lexer->handle_token (curr_lexer->m_string_text, \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	272 SQ_STRING); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	273 \
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	274 curr_lexer->m_string_text = ""; \
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	275 curr_lexer->m_command_arg_paren_count = 0; \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	276 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	277 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	278 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	279 return retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	280 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	281 while (0)
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	282
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	283 #define HANDLE_IDENTIFIER(pattern, get_set) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	284 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	285 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	286 curr_lexer->lexer_debug (pattern); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	287 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	288 int tok = curr_lexer->previous_token_value (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	289 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	290 if (curr_lexer->whitespace_is_significant () \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	291 && curr_lexer->space_follows_previous_token () \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	292 && ! (tok == '[' \|\| tok == '{' \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	293 \|\| curr_lexer->previous_token_is_binop ())) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	294 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	295 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	296 unput (','); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	297 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	298 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	299 { \
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	300 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	301 && curr_lexer->previous_token_may_be_command ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	302 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	303 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	304 curr_lexer->push_start_state (COMMAND_START); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	305 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	306 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	307 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	308 if (get_set) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	309 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	310 yyless (3); \
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	311 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	312 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	313 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	314 int id_tok = curr_lexer->handle_identifier (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	315 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	316 if (id_tok >= 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	317 return curr_lexer->count_token_internal (id_tok); \
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 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	321 while (0)
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	322
26710 d6dd07dce2d2 use inline functions for matching whitespace in lexer John W. Eaton <jwe@octave.org> parents: 26709 diff changeset	323 static inline bool
d6dd07dce2d2 use inline functions for matching whitespace in lexer John W. Eaton <jwe@octave.org> parents: 26709 diff changeset	324 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	325 {
d6dd07dce2d2 use inline functions for matching whitespace in lexer John W. Eaton <jwe@octave.org> parents: 26709 diff changeset	326 return c == ' ' \|\| c == '\t';
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
d6dd07dce2d2 use inline functions for matching whitespace in lexer John W. Eaton <jwe@octave.org> parents: 26709 diff changeset	329 static inline bool
d6dd07dce2d2 use inline functions for matching whitespace in lexer John W. Eaton <jwe@octave.org> parents: 26709 diff changeset	330 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	331 {
d6dd07dce2d2 use inline functions for matching whitespace in lexer John W. Eaton <jwe@octave.org> parents: 26709 diff changeset	332 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	333 }
d6dd07dce2d2 use inline functions for matching whitespace in lexer John W. Eaton <jwe@octave.org> parents: 26709 diff changeset	334
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	335 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	336
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	337 D [0-9]
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	338 D_ [0-9_]
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	339 S [ \t]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	340 NL ((\n)\|(\r)\|(\r\n))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	341 Im [iIjJ]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	342 CCHAR [#%]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	343 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	344 FQIDENT ({IDENT}({S}\.{S}{IDENT})*)
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	345 EXPON ([DdEe][+-]?{D}{D_}*)
20589 7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	346 NUMBIN (0[bB][01_]+)
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	347 NUMHEX (0[xX][0-9a-fA-F][0-9a-fA-F_]*)
20589 7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	348 NUMREAL (({D}{D_}\.?{D_}{EXPON}?)\|(\.{D}{D_}*{EXPON}?))
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	349 NUMBER ({NUMREAL}\|{NUMHEX}\|{NUMBIN})
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	350
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	351 ANY_EXCEPT_NL [^\r\n]
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	352 ANY_INCLUDING_NL (.\|{NL})
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	353
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	354 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	355
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	356 %{
20835 14cd86258b3d use 'invalid' instead of 'bogus' in source files John W. Eaton <jwe@octave.org> parents: 20812 diff changeset	357 // 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	358 // the parser go down a special path.
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	359 %}
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	360
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	361 <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	362 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	363
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	364 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	365
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	366 // 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	367 // 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	368 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	369
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	370 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	371
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	372 return curr_lexer->show_token (INPUT_FILE);
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	373 }
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	374
18774 4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	375 <INPUT_FILE_START><<EOF>> {
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	376 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	377
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	378 // 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	379 // 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	380 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	381
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	382 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	383
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	384 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	385 }
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	386
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	387 %{
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	388 // Help and other command-style functions.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	389 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	390
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	391 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	392 // 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	393 // 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	394 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	395
18312 7ac2a8b758fc maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18247 18311 diff changeset	396 <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	397 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	398
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	399 COMMAND_ARG_FINISH;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	400
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	401 HANDLE_STRING_CONTINUATION;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	402 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	403
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	404 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	405 // 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	406 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	407
18312 7ac2a8b758fc maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18247 18311 diff changeset	408 <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	409 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	410
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	411 COMMAND_ARG_FINISH;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	412
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	413 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	414 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	415 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	416 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	417
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	418 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	419 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	420
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	421 <COMMAND_START>[\,\;] {
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	422 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	423
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	424 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	425 {
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	426 COMMAND_ARG_FINISH;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	427 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	428 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	429 curr_lexer->pop_start_state ();
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	430 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	431 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	432 else
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	433 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	434
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	435 curr_lexer->m_filepos.increment_column (yyleng);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	436 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	437
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	438 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	439 // 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	440 // 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	441 // 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	442 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	443
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	444 <COMMAND_START>[\(\[\{]* {
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	445 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	446
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	447 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	448 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	449 curr_lexer->m_filepos.increment_column (yyleng);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	450 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	451
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	452 <COMMAND_START>[\)\]\}]* {
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	453 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	454
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	455 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	456 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	457 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	458 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	459
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	460 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	461 // 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	462 // 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	463 // text. For instance,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	464 //
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	465 // command 'text1'"text2"
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	466 //
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	467 // 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	468 // 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	469 // 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	470 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	471
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	472 <COMMAND_START>[\"\'] {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	473 curr_lexer->lexer_debug ("<COMMAND_START>[\\\"\\']");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	474
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	475 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	476 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	477 ? 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	478 else
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	479 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	480
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	481 curr_lexer->m_filepos.increment_column (yyleng);
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	482 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	483
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	484 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	485 // 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	486 // 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	487 // incorporated into the argument.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	488 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	489
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	490 <COMMAND_START>{S}* {
af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	491 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	492
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	493 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	494 COMMAND_ARG_FINISH;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	495 else
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	496 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	497
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	498 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	499 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	500
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	501 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	502 // 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	503 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	504
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	505 <COMMAND_START>([\.]\|[^#% \t\r\n\.\,\;\"\'$\[\{\}\]$]*) {
18458 ebb878596bcf Restore escaped backslashes accidentally deleted by cset af8a70d6885c Mike Miller <mtmiller@ieee.org> parents: 18437 diff changeset	506 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	507
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	508 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	509 curr_lexer->m_filepos.increment_column (yyleng);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	510 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	511
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	512 <MATRIX_START>{S}* {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	513 curr_lexer->lexer_debug ("<MATRIX_START>{S}*");
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	514
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	515 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	516
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	517 curr_lexer->mark_previous_token_trailing_space ();
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	518 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	519
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	520 <MATRIX_START>{NL} {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	521 curr_lexer->lexer_debug ("<MATRIX_START>{NL}");
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	522
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	523 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	524
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	525 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	526 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	527 else
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	528 {
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	529 int tok = curr_lexer->previous_token_value ();
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	530
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	531 if (! (tok == ';' \|\| tok == '[' \|\| tok == '{'))
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	532 {
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	533 curr_lexer->xunput (';');
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	534 // Adjust for semicolon that was not really in the input stream.
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	535 curr_lexer->m_filepos.decrement_column ();
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	536 }
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	537 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	538 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	539
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	540 %{
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	541 // 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	542 // need to know if the next token is '=' or '=='.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	543 //
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	544 // 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	545 // 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	546 // operator.
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	547 //
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	548 // 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	549 // after seeing a ']' character...
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	550
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17744 diff changeset	551 // FIXME: we need to handle block comments here.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	552 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	553
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	554 <MATRIX_START>\] {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	555 curr_lexer->lexer_debug ("<MATRIX_START>\\]");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	556
25708 ca38400776bc track column count in lexer in a few more places (bug #34852) John W. Eaton <jwe@octave.org> parents: 25646 diff changeset	557 return curr_lexer->handle_close_bracket (']');
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	558 }
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	559
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	560 %{
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17744 diff changeset	561 // 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	562 %}
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	563
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	564 <MATRIX_START>\} {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	565 curr_lexer->lexer_debug ("<MATRIX_START>\\}*");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	566
25708 ca38400776bc track column count in lexer in a few more places (bug #34852) John W. Eaton <jwe@octave.org> parents: 25646 diff changeset	567 return curr_lexer->handle_close_bracket ('}');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	568 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	569
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	570 \[ {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	571 curr_lexer->lexer_debug ("\\[");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	572
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	573 bool unput_comma = false;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	574
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	575 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	576 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	577 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	578 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	579
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	580 if (! (tok == '[' \|\| tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	581 \|\| curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	582 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	583 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	584
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	585 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	586 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	587 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	588 curr_lexer->xunput (',');
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	589 // Adjust for comma that was not really in the input stream.
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	590 curr_lexer->m_filepos.decrement_column ();
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	591 }
5615 d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe] jwe parents: 5570 diff changeset	592 else
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	593 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	594 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	595
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	596 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	597
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	598 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	599 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	600 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	601
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	602 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	603 && ! 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	604 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	605 else
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	606 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	607
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	608 curr_lexer->m_bracketflag++;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	609
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	610 curr_lexer->push_start_state (MATRIX_START);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	611
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	612 return curr_lexer->count_token ('[');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	613 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	614 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	615
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	616 \] {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	617 curr_lexer->lexer_debug ("\\]");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	618
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	619 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	620
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	621 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	622
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	623 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	624 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	625
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	626 return curr_lexer->handle_token (']');
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	627 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	628
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	629 %{
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	630 // 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	631 // 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	632 // 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	633 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	634
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	635 %{
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	636 // 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	637 // 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	638 // 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	639 // 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	640 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	641
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	642 ^{S}{CCHAR}\{{S}{NL} {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	643 curr_lexer->lexer_debug ("^{S}{CCHAR}\\{{S}{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	644
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	645 yyless (0);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	646
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	647 curr_lexer->push_start_state (BLOCK_COMMENT_START);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	648 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	649
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	650 <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	651 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	652
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	653 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	654
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	655 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	656 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	657
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	658 curr_lexer->m_block_comment_nesting_level++;
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	659 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	660
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	661 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	662 // 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	663 // 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	664 // 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	665
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121) John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	666 // 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	667 // 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	668 // follows.
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	669 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	670
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	671 <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	672 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	673
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	674 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	675
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	676 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	677 curr_lexer->m_comment_text = "\n";
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	678 else
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	679 curr_lexer->finish_comment (octave::comment_elt::block);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	680
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	681 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	682
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	683 if (curr_lexer->m_block_comment_nesting_level == 0)
27528 e51284fc0a51 eliminate promptflag from the lexer and input reader classes John W. Eaton <jwe@octave.org> parents: 27527 diff changeset	684 curr_lexer->pop_start_state ();
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	685 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	686
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	687 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	688 // Body of a block comment.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	689 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	690
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	691 <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	692 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	693
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	694 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	695 curr_lexer->m_comment_text += yytext;
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	696 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	697
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	698 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	699 // Full-line or end-of-line comment.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	700 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	701
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	702 {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	703 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	704
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	705 curr_lexer->push_start_state (LINE_COMMENT_START);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	706 yyless (0);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	707 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	708
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	709 %{
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 // 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	711 // 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	712 // 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	713
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121) John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	714 // 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	715 // 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	716 // 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	717 %}
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121) John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	718
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121) John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	719 <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	720 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	721
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121) John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	722 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	723 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	724
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121) John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	725 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	726 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	727 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	728 }
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121) John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	729
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121) John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	730 %{
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121) John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	731 // 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	732 // 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	733 // 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	734 // 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	735 // 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	736
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 // 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	738 // 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	739 // 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	740 %}
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
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	742 <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	743 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	744
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	745 // 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	746 // 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	747
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	748 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	749 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	750 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	751
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121) John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	752 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	753
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121) John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	754 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	755 i++;
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	756
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	757 curr_lexer->m_comment_text += &yytext[i];
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	758
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	759 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	760 {
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	761 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	762 }
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	763 else
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	764 {
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	765 // 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	766
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	767 if (have_space)
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	768 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	769
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	770 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	771
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	772 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	773
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	774 // 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	775 // 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	776 // 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	777
16337 6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549) John W. Eaton <jwe@octave.org> parents: 16334 diff changeset	778 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	779
5aad387784aa fix line count in lexer when mixing line and block comments (bug #57121) John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	780 // 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	781 // 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	782 // 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	783 curr_lexer->m_filepos.increment_column (yyleng);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	784 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	785 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	786
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	787 %{
27760 16e83787f970 fix handling of full line comments at command prompt (bug #57208) John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	788 // 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	789 // found on the input stream.
16228 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
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	792 <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	793 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	794
27760 16e83787f970 fix handling of full line comments at command prompt (bug #57208) John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	795 // Restore all characters except the ASCII 1 marker that was
16e83787f970 fix handling of full line comments at command prompt (bug #57208) John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	796 // inserted by push_lexer::fill_flex_buffer.
16e83787f970 fix handling of full line comments at command prompt (bug #57208) John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	797
16e83787f970 fix handling of full line comments at command prompt (bug #57208) John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	798 if (yytext[0] != '\001')
16e83787f970 fix handling of full line comments at command prompt (bug #57208) John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	799 curr_lexer->xunput (yytext[0]);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	800
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	801 curr_lexer->finish_comment (octave::comment_elt::full_line);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	802
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	803 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	804 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	805
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	806 %{
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	807 // 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	808 %}
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	809
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	810 <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	811 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	812
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	813 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	814
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	815 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	816 }
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	817
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	818 %{
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	819 // Double-quoted character strings.
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	820 %}
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	821
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	822 <DQ_STRING_START>\"\" {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	823 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	824
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	825 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	826 curr_lexer->m_string_text += '"';
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	827 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	828
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	829 <DQ_STRING_START>\" {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	830 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	831
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	832 curr_lexer->m_filepos.increment_column ();
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	833
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	834 curr_lexer->pop_start_state ();
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	835
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	836 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	837 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	838 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	839 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	840
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	841 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	842 curr_lexer->m_string_text,
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	843 curr_lexer->m_beg_string,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	844 curr_lexer->m_filepos));
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	845
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	846 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	847
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	848 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	849 }
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	850 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	851
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	852 <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	853 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	854
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	855 curr_lexer->m_filepos.increment_column (yyleng);
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	856
26450 af7faef288ad lex.ll: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	857 unsigned int result;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	858 sscanf (yytext+1, "%o", &result);
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	859
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	860 if (result > 0xff)
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	861 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	862 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	863 = new octave::token (LEXICAL_ERROR,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	864 "invalid octal escape sequence in character string",
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	865 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	866
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	867 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	868
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	869 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	870 }
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	871 else
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	872 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	873 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	874
17244 9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	875 <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	876 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	877
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	878 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	879
26450 af7faef288ad lex.ll: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	880 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	881 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	882
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	883 // 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	884 // 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	885 // 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	886 // 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	887 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	888 }
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	889
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	890 <DQ_STRING_START>"\\a" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	891 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	892
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	893 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	894 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	895 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	896
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	897 <DQ_STRING_START>"\\b" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	898 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	899
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	900 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	901 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	902 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	903
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	904 <DQ_STRING_START>"\\f" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	905 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	906
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	907 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	908 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	909 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	910
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	911 <DQ_STRING_START>"\\n" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	912 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	913
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	914 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	915 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	916 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	917
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	918 <DQ_STRING_START>"\\r" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	919 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	920
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	921 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	922 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	923 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	924
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	925 <DQ_STRING_START>"\\t" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	926 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	927
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	928 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	929 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	930 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	931
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	932 <DQ_STRING_START>"\\v" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	933 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	934
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	935 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	936 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	937 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	938
18428 4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415). Stefan Mahr <dac922@gmx.de> parents: 18319 diff changeset	939 <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	940 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	941
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	942 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	943
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	944 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	945
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	946 if (nm.empty ())
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	947 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	948 else
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	949 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	950 "%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	951 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	952
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	953 HANDLE_STRING_CONTINUATION;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	954 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	955
18428 4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415). Stefan Mahr <dac922@gmx.de> parents: 18319 diff changeset	956 <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	957 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	958
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	959 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	960
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	961 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	962
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	963 if (nm.empty ())
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	964 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	965 else
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	966 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	967 "%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	968 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	969
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	970 HANDLE_STRING_CONTINUATION;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	971 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	972
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	973 <DQ_STRING_START>\\{NL} {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	974 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	975
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	976 HANDLE_STRING_CONTINUATION;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	977 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	978
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	979 <DQ_STRING_START>\\. {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	980 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	981
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	982 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	983 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	984 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	985
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	986 <DQ_STRING_START>\. {
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	987 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	988
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	989 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	990 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	991 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	992
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	993 <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	994 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	995
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	996 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	997 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	998 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	999
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1000 <DQ_STRING_START>{NL} {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1001 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	1002
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1003 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1004 = new octave::token (LEXICAL_ERROR,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1005 "unterminated character string constant",
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	1006 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	1007
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1008 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1009
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	1010 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	1011
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1012 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	1013 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1014
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1015 %{
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1016 // Single-quoted character strings.
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1017 %}
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1018
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1019 <SQ_STRING_START>\'\' {
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1020 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	1021
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	1022 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	1023 curr_lexer->m_string_text += '\'';
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1024 }
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1025
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1026 <SQ_STRING_START>\' {
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1027 curr_lexer->lexer_debug ("<SQ_STRING_START>\\'");
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1028
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	1029 curr_lexer->m_filepos.increment_column ();
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1030
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1031 curr_lexer->pop_start_state ();
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1032
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1033 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	1034 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1035 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	1036 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	1037
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1038 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	1039 curr_lexer->m_string_text,
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	1040 curr_lexer->m_beg_string,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	1041 curr_lexer->m_filepos));
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1042
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 = "";
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1044
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1045 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	1046 }
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1047 }
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1048
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1049 <SQ_STRING_START>[^\'\n\r]+ {
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1050 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	1051
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	1052 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	1053 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	1054 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1055
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1056 <SQ_STRING_START>{NL} {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1057 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	1058
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1059 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1060 = new octave::token (LEXICAL_ERROR,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1061 "unterminated character string constant",
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	1062 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	1063
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1064 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1065
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	1066 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	1067
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1068 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	1069 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1070
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1071 %{
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1072 // Fully-qualified identifiers (used for classdef).
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1073 %}
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1074
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1075 <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	1076 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	1077
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1078 curr_lexer->pop_start_state ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1079
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1080 int id_tok = curr_lexer->handle_fq_identifier ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1081
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1082 if (id_tok >= 0)
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1083 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1084 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	1085
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1086 return curr_lexer->count_token_internal (id_tok);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1087 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1088 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1089
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1090 <FQ_IDENT_START>{S}+ {
27052 44d1fe403c19 eliminate mysterious newline output (bug #44934) John W. Eaton <jwe@octave.org> parents: 26899 diff changeset	1091 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	1092
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	1093 curr_lexer->m_filepos.increment_column (yyleng);
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1094
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1095 curr_lexer->mark_previous_token_trailing_space ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1096 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1097
27052 44d1fe403c19 eliminate mysterious newline output (bug #44934) John W. Eaton <jwe@octave.org> parents: 26899 diff changeset	1098 <FQ_IDENT_START>(\.\.\.){ANY_EXCEPT_NL}*{NL} {
44d1fe403c19 eliminate mysterious newline output (bug #44934) John W. Eaton <jwe@octave.org> parents: 26899 diff changeset	1099 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	1100
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	1101 curr_lexer->m_filepos.next_line ();
27052 44d1fe403c19 eliminate mysterious newline output (bug #44934) John W. Eaton <jwe@octave.org> parents: 26899 diff changeset	1102 }
44d1fe403c19 eliminate mysterious newline output (bug #44934) John W. Eaton <jwe@octave.org> parents: 26899 diff changeset	1103
44d1fe403c19 eliminate mysterious newline output (bug #44934) John W. Eaton <jwe@octave.org> parents: 26899 diff changeset	1104 <FQ_IDENT_START>{ANY_INCLUDING_NL} {
44d1fe403c19 eliminate mysterious newline output (bug #44934) John W. Eaton <jwe@octave.org> parents: 26899 diff changeset	1105 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	1106
26708 606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	1107 // 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	1108 // start state.
27052 44d1fe403c19 eliminate mysterious newline output (bug #44934) John W. Eaton <jwe@octave.org> parents: 26899 diff changeset	1109
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1110 yyless (0);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1111 curr_lexer->pop_start_state ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1112 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1113
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1114 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1115 // Imaginary numbers.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1116 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1117
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1118 {NUMBER}{Im} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1119 curr_lexer->lexer_debug ("{NUMBER}{Im}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1120
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1121 if (curr_lexer->previous_token_may_be_command ()
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1122 && curr_lexer->space_follows_previous_token ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1123 {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1124 yyless (0);
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1125 curr_lexer->push_start_state (COMMAND_START);
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1126 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1127 else
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1128 {
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1129 int tok = curr_lexer->previous_token_value ();
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1130
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1131 if (curr_lexer->whitespace_is_significant ()
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1132 && curr_lexer->space_follows_previous_token ()
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1133 && ! (tok == '[' \|\| tok == '{'
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1134 \|\| curr_lexer->previous_token_is_binop ()))
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1135 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1136 yyless (0);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1137 unput (',');
25708 ca38400776bc track column count in lexer in a few more places (bug #34852) John W. Eaton <jwe@octave.org> parents: 25646 diff changeset	1138 // Adjust for comma that was not really in the input stream.
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	1139 curr_lexer->m_filepos.decrement_column ();
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1140 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1141 else
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1142 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1143 curr_lexer->handle_number ();
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1144 return curr_lexer->count_token_internal (IMAG_NUM);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1145 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1146 }
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1147 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1148
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1149 %{
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	1150 // Real numbers. Don't grab the '.' part of a dot operator as part of
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1151 // the constant.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1152 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1153
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	1154 {D}{D_}/\.[\/\\^\'] \|
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1155 {NUMBER} {
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	1156 curr_lexer->lexer_debug ("{D}{D_}/\\.[\\/\\\\^\\']\|{NUMBER}");
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1157
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1158 if (curr_lexer->previous_token_may_be_command ()
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1159 && curr_lexer->space_follows_previous_token ())
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1160 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1161 yyless (0);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1162 curr_lexer->push_start_state (COMMAND_START);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1163 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1164 else
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1165 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1166 int tok = curr_lexer->previous_token_value ();
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1167
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1168 if (curr_lexer->whitespace_is_significant ()
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1169 && curr_lexer->space_follows_previous_token ()
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1170 && ! (tok == '[' \|\| tok == '{'
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1171 \|\| curr_lexer->previous_token_is_binop ()))
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1172 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1173 yyless (0);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1174 unput (',');
25708 ca38400776bc track column count in lexer in a few more places (bug #34852) John W. Eaton <jwe@octave.org> parents: 25646 diff changeset	1175 // Adjust for comma that was not really in the input stream.
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.decrement_column ();
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1177 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1178 else
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1179 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1180 curr_lexer->handle_number ();
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1181 return curr_lexer->count_token_internal (NUM);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1182 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1183 }
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1184 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1185
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1186 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1187 // 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	1188 // the <MATRIX_START> start state code above.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1189 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1190
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	1191 {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	1192 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	1193
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	1194 curr_lexer->mark_previous_token_trailing_space ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1195 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1196
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1197 %{
17247 e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1198 // 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	1199 %}
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1200
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	1201 \.\.\.{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	1202 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	1203
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1204 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	1205 }
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1206
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1207 %{
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1208 // Deprecated C preprocessor style continuation markers.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1209 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1210
17246 8be8a65d3ca8 Ignore anything after the continuation marker '...' (bug #38653) Stefan Mahr <dac922@gmx.de> parents: 17244 diff changeset	1211 \\{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	1212 \\{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	1213 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	1214
22505 7bdc80232cdc Expand warning for '\' continuation marker to recommend "..." (bug #48810). Rik <rik@octave.org> parents: 22323 diff changeset	1215 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	1216
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1217 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	1218
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1219 if (nm.empty ())
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1220 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	1221 else
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1222 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	1223 "%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	1224 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	1225
6470a113eae2 correctly handle deprecated \ continuation markers John W. Eaton <jwe@octave.org> parents: 17247 diff changeset	1226 curr_lexer->handle_continuation ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1227 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1228
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1229 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1230 // End of file.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1231 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1232
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1233 <<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	1234 return curr_lexer->handle_end_of_input ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1235 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1236
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1237 %{
16259 0b5ab09dfce4 2/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16257 diff changeset	1238 // 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	1239
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1240 // 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	1241 // followed by "(".
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1242 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1243
21705 764e586dca4b Avoid use of REJECT in parser (bug #45947). Rik <rik@octave.org> parents: 21635 diff changeset	1244 (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	1245 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	1246 }
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1247
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1248 {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	1249 HANDLE_IDENTIFIER ("{IDENT}", false);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1250 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1251
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1252 %{
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1253 // Superclass method identifiers.
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1254 %}
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1255
26708 606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	1256 {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	1257 curr_lexer->lexer_debug ("{FQIDENT}{S}@{S}{FQIDENT}");
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1258
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1259 if (curr_lexer->previous_token_may_be_command ())
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1260 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1261 yyless (0);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1262 curr_lexer->push_start_state (COMMAND_START);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1263 }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1264 else
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1265 {
26899 236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891) John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	1266 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	1267 {
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891) John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	1268 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	1269
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891) John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	1270 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	1271
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891) John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	1272 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	1273 {
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891) John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	1274 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	1275
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891) John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	1276 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	1277 {
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891) John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	1278 yyless (spc_pos);
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891) John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	1279 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	1280 }
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891) John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	1281 }
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891) John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	1282 }
236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891) John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	1283
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1284 int id_tok = curr_lexer->handle_superclass_identifier ();
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1285
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1286 if (id_tok >= 0)
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1287 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1288 curr_lexer->m_looking_for_object_index = true;
26899 236d8f52cbb3 identify "x .foo@bar" or "x @foo" as command syntax (bug #55891) John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	1289 curr_lexer->m_at_beginning_of_statement = false;
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1290
16683 e1c6ad54259f maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16645 16681 diff changeset	1291 return curr_lexer->count_token_internal (id_tok);
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1292 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1293 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1294 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1295
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1296 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1297 // Metaclass query
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1298 %}
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1299
26708 606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	1300 \?{S}*{FQIDENT} {
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	1301 curr_lexer->lexer_debug ("\\?{S}*{FQIDENT}");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1302
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1303 if (curr_lexer->previous_token_may_be_command ()
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1304 && curr_lexer->space_follows_previous_token ())
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1305 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1306 yyless (0);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1307 curr_lexer->push_start_state (COMMAND_START);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1308 }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1309 else
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1310 {
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1311 int id_tok = curr_lexer->handle_meta_identifier ();
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1312
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1313 if (id_tok >= 0)
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1314 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1315 curr_lexer->m_looking_for_object_index = true;
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1316
16683 e1c6ad54259f maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16645 16681 diff changeset	1317 return curr_lexer->count_token_internal (id_tok);
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1318 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1319 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1320 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1321
26740 cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1322 \@ \|
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1323 \@{S}*{FQIDENT} {
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1324 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	1325
16334 06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1326 if (curr_lexer->previous_token_may_be_command ()
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1327 && curr_lexer->space_follows_previous_token ())
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1328 {
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1329 yyless (0);
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1330 curr_lexer->push_start_state (COMMAND_START);
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1331 }
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1332 else
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1333 {
26740 cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1334 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	1335
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1336 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	1337 && 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	1338 && ! (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	1339 \|\| 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	1340 {
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1341 yyless (0);
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1342 unput (',');
25708 ca38400776bc track column count in lexer in a few more places (bug #34852) John W. Eaton <jwe@octave.org> parents: 25646 diff changeset	1343 // Adjust for comma that was not really in the input stream.
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	1344 curr_lexer->m_filepos.decrement_column ();
18492 e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1345 }
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1346 else
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1347 {
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	1348 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	1349 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	1350
26740 cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1351 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	1352
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1353 if (ident == "@")
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1354 {
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1355 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	1356 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	1357
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1358 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	1359 }
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1360 else
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1361 {
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1362 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	1363 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	1364 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	1365
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1366 int kw_token = curr_lexer->is_keyword_token (ident);
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1367
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1368 octave::token *tok;
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1369
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1370 if (kw_token)
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1371 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	1372 "function handles may not refer to keywords",
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	1373 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	1374 curr_lexer->m_filepos);
26740 cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1375 else
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1376 {
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1377 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	1378
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1379 tok = new octave::token (FCN_HANDLE, ident,
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	1380 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	1381 curr_lexer->m_filepos);
26740 cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1382 }
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1383
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1384 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	1385
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	1386 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	1387 }
18492 e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1388 }
16334 06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1389 }
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	1390 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	1391
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	1392 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1393 // 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	1394 // 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	1395 // 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	1396 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1397
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1398 {NL} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1399 curr_lexer->lexer_debug ("{NL}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1400
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1401 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	1402 {
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	1403 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	1404
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1405 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	1406 curr_lexer->warn_language_extension
16309 e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1407 ("bare newline inside parentheses");
e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1408 }
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1409 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	1410 \|\| 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	1411 {
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	1412 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	1413
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1414 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	1415
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1416 return curr_lexer->count_token ('\n');
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	1417 }
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1418 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	1419 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1420 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1421 = new octave::token (LEXICAL_ERROR,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1422 "unexpected internal lexer error",
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	1423 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	1424
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1425 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1426
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	1427 curr_lexer->m_filepos.next_line ();
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1428
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1429 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	1430 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1431 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1432
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1433 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1434 // 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	1435 // operator.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1436 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1437
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1438 "'" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1439 curr_lexer->lexer_debug ("'");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1440
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1441 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	1442 && curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1443 {
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	1444 curr_lexer->m_filepos.increment_column ();
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1445 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	1446 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	1447 }
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1448 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	1449 {
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	1450 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	1451 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	1452 }
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1453 else
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1454 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1455 int tok = curr_lexer->previous_token_value ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1456
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1457 if (curr_lexer->whitespace_is_significant ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1458 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1459 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	1460 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1461 if (tok == '[' \|\| tok == '{'
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1462 \|\| curr_lexer->previous_token_is_binop ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1463 {
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	1464 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	1465 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	1466 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1467 else
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1468 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1469 yyless (0);
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1470 curr_lexer->xunput (',');
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1471 // Adjust for comma that was not really in the input stream.
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	1472 curr_lexer->m_filepos.decrement_column ();
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1473 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1474 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1475 else
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1476 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1477 if (tok == '[' \|\| tok == '{'
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1478 \|\| curr_lexer->previous_token_is_binop ()
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1479 \|\| curr_lexer->previous_token_is_keyword ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1480 {
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	1481 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	1482 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	1483 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1484 else
25719 e3c612c0b744 track column count in one more place in lexer John W. Eaton <jwe@octave.org> parents: 25708 diff changeset	1485 {
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	1486 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	1487 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	1488 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1489 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1490 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1491 else
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1492 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1493 if (! tok \|\| tok == '[' \|\| tok == '{' \|\| tok == '('
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1494 \|\| curr_lexer->previous_token_is_binop ()
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1495 \|\| curr_lexer->previous_token_is_keyword ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1496 {
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	1497 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	1498 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	1499 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1500 else
25719 e3c612c0b744 track column count in one more place in lexer John W. Eaton <jwe@octave.org> parents: 25708 diff changeset	1501 {
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	1502 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	1503 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	1504 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1505 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1506 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1507 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1508
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1509 %{
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1510 // Double quotes always begin strings.
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1511 %}
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1512
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	1513 \" {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1514 curr_lexer->lexer_debug ("\\\"");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1515
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1516 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	1517 && curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1518 {
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	1519 curr_lexer->m_filepos.increment_column ();
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1520 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	1521 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	1522 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1523 else
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1524 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1525 int tok = curr_lexer->previous_token_value ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1526
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1527 if (curr_lexer->whitespace_is_significant ())
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1528 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1529 if (curr_lexer->space_follows_previous_token ())
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 (tok == '[' \|\| tok == '{'
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1532 \|\| curr_lexer->previous_token_is_binop ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1533 {
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	1534 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	1535 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	1536 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1537 else
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1538 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1539 yyless (0);
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1540 curr_lexer->xunput (',');
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1541 // Adjust for comma that was not really in the input stream.
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	1542 curr_lexer->m_filepos.decrement_column ();
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1543 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1544 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1545 else
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1546 {
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	1547 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	1548 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	1549 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1550 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1551 else
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 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 (DQ_STRING_START);
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1555 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1556 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1557 }
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1558
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1559 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1560 // Other operators.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1561 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1562
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1563 ":" { CMD_OR_OP (":", ':', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1564 ".+" { CMD_OR_OP (".+", EPLUS, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1565 ".-" { CMD_OR_OP (".-", EMINUS, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1566 "." { CMD_OR_OP (".", EMUL, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1567 "./" { CMD_OR_OP ("./", EDIV, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1568 ".\\" { CMD_OR_OP (".\\", ELEFTDIV, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1569 ".^" { CMD_OR_OP (".^", EPOW, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1570 "." { CMD_OR_OP (".", EPOW, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1571 "<=" { CMD_OR_OP ("<=", EXPR_LE, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1572 "==" { CMD_OR_OP ("==", EXPR_EQ, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1573 "~=" { CMD_OR_OP ("~=", EXPR_NE, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1574 "!=" { CMD_OR_OP ("!=", EXPR_NE, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1575 ">=" { CMD_OR_OP (">=", EXPR_GE, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1576 "&" { CMD_OR_OP ("&", EXPR_AND, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1577 "\|" { CMD_OR_OP ("\|", EXPR_OR, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1578 "<" { CMD_OR_OP ("<", EXPR_LT, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1579 ">" { CMD_OR_OP (">", EXPR_GT, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1580 "" { CMD_OR_OP ("", '*', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1581 "/" { CMD_OR_OP ("/", '/', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1582
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1583 %{
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1584 // In Matlab, '\' may also trigger command syntax.
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1585 %}
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1586
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1587 "\\" { return curr_lexer->handle_op ("\\", LEFTDIV); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1588
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1589 "^" { CMD_OR_OP ("^", POW, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1590 "" { CMD_OR_OP ("", POW, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1591 "&&" { CMD_OR_OP ("&&", EXPR_AND_AND, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1592 "\|\|" { 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	1593
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1594 ";" {
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1595 bool at_beginning_of_statement
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1596 = (! (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	1597 \|\| 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	1598
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1599 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	1600 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1601
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1602 "+" { CMD_OR_UNARY_OP ("+", '+', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1603 "-" { CMD_OR_UNARY_OP ("-", '-', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1604
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1605 "~" { CMD_OR_UNARY_OP ("~", EXPR_NOT, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1606 "!" { 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	1607
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1608 "," {
16265 71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1609 bool at_beginning_of_statement
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1610 = (! (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	1611 \|\| 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	1612
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1613 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	1614 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1615
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1616 ".'" {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1617 return curr_lexer->handle_op (".'", TRANSPOSE, false);
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1618 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1619
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1620 "++" { CMD_OR_UNARY_OP ("++", PLUS_PLUS, false); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1621 "--" { CMD_OR_UNARY_OP ("--", MINUS_MINUS, false); }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1622
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1623 "(" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1624 curr_lexer->lexer_debug ("(");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1625
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1626 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1627
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1628 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1629 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1630 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1631 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1632
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1633 if (! (tok == '[' \|\| tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1634 \|\| curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1635 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1636 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1637
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1638 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1639 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1640 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1641 curr_lexer->xunput (',');
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1642 // Adjust for comma that was not really in the input stream.
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	1643 curr_lexer->m_filepos.decrement_column ();
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1644 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1645 else
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1646 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1647 // 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	1648 // 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	1649 // 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	1650 // the matching close paren).
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1651
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1652 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	1653 (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	1654
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1655 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	1656 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	1657 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	1658
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1659 curr_lexer->m_nesting_level.paren ();
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1660
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1661 return curr_lexer->handle_token ('(');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1662 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1663 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1664
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1665 ")" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1666 curr_lexer->lexer_debug (")");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1667
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1668 curr_lexer->m_nesting_level.remove ();
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	1669 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	1670
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1671 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	1672
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_for_object_index = true;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1674 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	1675
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1676 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	1677 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1678 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	1679 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	1680 }
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 12801 diff changeset	1681
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1682 return curr_lexer->count_token (')');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1683 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1684
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1685 "." {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1686 curr_lexer->lexer_debug (".");
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1687
16325 fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1688 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	1689 && curr_lexer->space_follows_previous_token ())
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1690 {
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1691 yyless (0);
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1692 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	1693 }
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1694 else
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1695 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1696 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	1697 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	1698
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1699 return curr_lexer->handle_token ('.');
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1700 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1701 }
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1702
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1703 %{
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1704 // = and op= operators.
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1705 %}
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1706
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1707 "=" {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1708 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	1709
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1710 return curr_lexer->handle_op ("=", '=');
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1711 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1712
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1713 "+=" { CMD_OR_COMPUTED_ASSIGN_OP ("+=", ADD_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1714 "-=" { CMD_OR_COMPUTED_ASSIGN_OP ("-=", SUB_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1715 "=" { CMD_OR_COMPUTED_ASSIGN_OP ("=", MUL_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1716 "/=" { CMD_OR_COMPUTED_ASSIGN_OP ("/=", DIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1717 "\\=" { CMD_OR_COMPUTED_ASSIGN_OP ("\\=", LEFTDIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1718 ".+=" { CMD_OR_COMPUTED_ASSIGN_OP (".+=", ADD_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1719 ".-=" { CMD_OR_COMPUTED_ASSIGN_OP (".-=", SUB_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1720 ".=" { CMD_OR_COMPUTED_ASSIGN_OP (".=", EMUL_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1721 "./=" { CMD_OR_COMPUTED_ASSIGN_OP ("./=", EDIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1722 ".\\=" { CMD_OR_COMPUTED_ASSIGN_OP (".\\=", ELEFTDIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1723 "^=" { CMD_OR_COMPUTED_ASSIGN_OP ("^=", POW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1724 "**=" { CMD_OR_COMPUTED_ASSIGN_OP ("^=", POW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1725 ".^=" { CMD_OR_COMPUTED_ASSIGN_OP (".^=", EPOW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1726 ".**=" { CMD_OR_COMPUTED_ASSIGN_OP (".^=", EPOW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1727 "&=" { CMD_OR_COMPUTED_ASSIGN_OP ("&=", AND_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1728 "\|=" { 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	1729
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1730 %{
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1731 // In Matlab, '{' may also trigger command syntax.
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1732 %}
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1733
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1734 "{" {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1735 curr_lexer->lexer_debug ("{");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1736
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1737 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1738
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1739 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1740 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1741 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1742 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1743
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1744 if (! (tok == '[' \|\| tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1745 \|\| curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1746 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1747 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1748
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1749 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1750 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1751 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1752 curr_lexer->xunput (',');
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1753 // Adjust for comma that was not really in the input stream.
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	1754 curr_lexer->m_filepos.decrement_column ();
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1755 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1756 else
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1757 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1758 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	1759
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1760 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	1761 (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	1762
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	1763 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	1764 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	1765 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	1766
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1767 curr_lexer->m_braceflag++;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1768
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1769 curr_lexer->push_start_state (MATRIX_START);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1770
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1771 return curr_lexer->count_token ('{');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1772 }
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1773 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1774
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1775 "}" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1776 curr_lexer->lexer_debug ("}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1777
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1778 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	1779
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1780 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	1781 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	1782
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1783 curr_lexer->m_nesting_level.remove ();
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1784
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1785 return curr_lexer->handle_token ('}');
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1786 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1787
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1788 %{
2066 a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe] jwe parents: 2042 diff changeset	1789 // Unrecognized input is a lexical error.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1790 %}
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1791
2042 31f4f775b8c6 [project @ 1996-03-28 09:06:28 by jwe] jwe parents: 1994 diff changeset	1792 . {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1793 curr_lexer->lexer_debug (".");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1794
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1795 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	1796
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1797 int c = curr_lexer->text_yyinput ();
4248 eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe] jwe parents: 4241 diff changeset	1798
16294 0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1799 if (c == 1)
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1800 return -1;
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1801 else if (c == EOF)
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1802 return curr_lexer->handle_end_of_input ();
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1803 else
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	1804 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1805 std::ostringstream buf;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1806
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1807 buf << "invalid character '"
25646 4d565baa475e move libinterp/utils functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 25443 diff changeset	1808 << 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	1809 << "' (ASCII " << c << ")";
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1810
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1811 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1812 = 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	1813 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	1814
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1815 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1816
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	1817 curr_lexer->m_filepos.increment_column ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1818
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1819 return curr_lexer->count_token_internal (LEXICAL_ERROR);
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	1820 }
2066 a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe] jwe parents: 2042 diff changeset	1821 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1822
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1823 %{
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1824 #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	1825 // Disable these warnings for flex code.
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24387 diff changeset	1826 # 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	1827 # 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	1828 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1829 %}
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1830
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1831 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1832
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1833 #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	1834 // 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	1835 # pragma GCC diagnostic pop
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1836 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1837
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1838 void *
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1839 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	1840 {
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21912 diff changeset	1841 return std::malloc (size);
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1842 }
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1843
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1844 void *
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1845 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	1846 {
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21912 diff changeset	1847 return std::realloc (ptr, size);
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1848 }
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1849
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1850 void
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1851 octave_free (void *ptr, yyscan_t)
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1852 {
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21912 diff changeset	1853 std::free (ptr);
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1854 }
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1855
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1856 static void
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1857 display_character (char c)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1858 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1859 if (isgraph (c))
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1860 std::cerr << c;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1861 else
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1862 switch (c)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1863 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1864 case 0:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1865 std::cerr << "NUL";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1866 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1867
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1868 case 1:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1869 std::cerr << "SOH";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1870 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1871
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1872 case 2:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1873 std::cerr << "STX";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1874 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1875
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1876 case 3:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1877 std::cerr << "ETX";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1878 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1879
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1880 case 4:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1881 std::cerr << "EOT";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1882 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1883
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1884 case 5:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1885 std::cerr << "ENQ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1886 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1887
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1888 case 6:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1889 std::cerr << "ACK";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1890 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1891
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1892 case 7:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1893 std::cerr << "\\a";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1894 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1895
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1896 case 8:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1897 std::cerr << "\\b";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1898 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1899
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1900 case 9:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1901 std::cerr << "\\t";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1902 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1903
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1904 case 10:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1905 std::cerr << "\\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1906 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1907
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1908 case 11:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1909 std::cerr << "\\v";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1910 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1911
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1912 case 12:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1913 std::cerr << "\\f";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1914 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1915
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1916 case 13:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1917 std::cerr << "\\r";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1918 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1919
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1920 case 14:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1921 std::cerr << "SO";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1922 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1923
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1924 case 15:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1925 std::cerr << "SI";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1926 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1927
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1928 case 16:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1929 std::cerr << "DLE";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1930 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1931
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1932 case 17:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1933 std::cerr << "DC1";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1934 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1935
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1936 case 18:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1937 std::cerr << "DC2";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1938 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1939
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1940 case 19:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1941 std::cerr << "DC3";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1942 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1943
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1944 case 20:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1945 std::cerr << "DC4";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1946 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1947
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1948 case 21:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1949 std::cerr << "NAK";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1950 break;
8535 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 22:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1953 std::cerr << "SYN";
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 23:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1957 std::cerr << "ETB";
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 24:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1961 std::cerr << "CAN";
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 25:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1965 std::cerr << "EM";
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 26:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1969 std::cerr << "SUB";
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 27:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1973 std::cerr << "ESC";
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 28:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1977 std::cerr << "FS";
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 29:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1981 std::cerr << "GS";
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 30:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1985 std::cerr << "RS";
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 31:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1989 std::cerr << "US";
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 32:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1993 std::cerr << "SPACE";
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 127:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1997 std::cerr << "DEL";
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 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2001
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2002 namespace octave
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2003 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2004 bool
26059 da2bbcf1fbcd Deprecate C++ function is_keyword in favor of iskeyword for readability. Rik <rik@octave.org> parents: 25994 diff changeset	2005 iskeyword (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	2006 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2007 // Parsing function names like "set.property_name" inside
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2008 // classdef-style class definitions is simplified by handling the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2009 // "set" and "get" portions of the names using the same mechanism
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2010 // as is used for keywords. However, they are not really keywords
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2011 // in the language, so omit them from the list of possible
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2012 // keywords. Likewise for "enumeration", "events", "methods", and
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2013 // "properties".
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2014
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23787 diff changeset	2015 return (octave_kw_hash::in_word_set (s.c_str (), s.length ()) != nullptr
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2016 && ! (s == "set" \|\| s == "get"
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2017 \|\| s == "enumeration" \|\| s == "events"
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2018 \|\| s == "methods" \|\| s == "properties"));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2019 }
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2020 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2021
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2022 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	2023 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	2024 @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	2025 @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	2026 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	2027
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2028 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	2029 @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	2030 @end deftypefn */)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2031 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2032 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2033
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2034 int nargin = args.length ();
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2035
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2036 if (nargin > 1)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20773 diff changeset	2037 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20773 diff changeset	2038
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2039 if (nargin == 0)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2040 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2041 // 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	2042 // iskeyword function for additional details.
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2043
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2044 string_vector lst (TOTAL_KEYWORDS);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2045
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2046 int j = 0;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2047
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2048 for (int i = 0; i < TOTAL_KEYWORDS; i++)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2049 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2050 std::string kword = wordlist[i].name;
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2051
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2052 if (kword != "set" && kword != "get")
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2053 lst[j++] = kword;
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2054 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2055
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2056 lst.resize (j);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2057
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2058 retval = Cell (lst.sort ());
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2059 }
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2060 else
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2061 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2062 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	2063 retval = octave::iskeyword (name);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2064 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2065
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2066 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2067 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2068
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2069 /*
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2070
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2071 %!assert (iskeyword ("for"))
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2072 %!assert (iskeyword ("fort"), false)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2073 %!assert (iskeyword ("fft"), false)
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2074 %!assert (iskeyword ("get"), false)
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2075 %!assert (iskeyword ("set"), false)
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2076
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2077 %!error iskeyword ("A", "B")
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2078 %!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	2079
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2080 */
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2081
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2082 namespace octave
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2083 {
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2084 void
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2085 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	2086 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2087 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	2088 m_frame_stack.pop_front ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2089 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2090
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2091 void
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2092 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	2093 {
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2094 if (empty ())
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2095 panic_impossible ();
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2096
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2097 m_frame_stack.pop_front ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2098 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2099
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2100 symbol_scope
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2101 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	2102 {
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2103 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	2104 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	2105 else
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2106 return m_frame_stack.front ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2107 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2108
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2109 symbol_scope
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2110 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	2111 {
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2112 size_t sz = size ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2113
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2114 return (sz > 1
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2115 ? m_frame_stack[1]
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2116 : (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	2117 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2118
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2119 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	2120 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2121 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	2122 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2123
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2124 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2125 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	2126 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2127 // 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	2128 // index.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2129 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	2130 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2131
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2132 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2133 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	2134 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2135 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	2136 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	2137 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	2138 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	2139 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	2140 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	2141 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	2142 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	2143 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	2144 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	2145 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	2146 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	2147 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	2148 m_parsing_classdef = false;
26709 17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	2149 m_parsing_classdef_decl = false;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	2150 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	2151 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	2152 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	2153 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	2154 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	2155 m_force_script = false;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2156 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	2157 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	2158 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	2159 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	2160 m_bracketflag = 0;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2161 m_braceflag = 0;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2162 m_looping = 0;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2163 m_defining_func = 0;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2164 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	2165 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	2166 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	2167 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	2168 m_filepos = filepos ();
27768 d6701f835496 use filepos object to store beginning position of character strings John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	2169 m_beg_string = filepos ();
d6701f835496 use filepos object to store beginning position of character strings John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	2170 m_string_text = "";
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2171 m_current_input_line = "";
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2172 m_comment_text = "";
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2173 m_help_text = "";
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2174 m_function_text = "";
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2175 m_fcn_file_name = "";
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2176 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	2177 m_dir_name = "";
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2178 m_package_name = "";
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2179 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	2180 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	2181
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2182 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	2183 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	2184
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2185 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	2186 m_symtab_context.clear ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2187 m_nesting_level.reset ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2188 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	2189 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2190
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2191 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2192 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	2193 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2194 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	2195 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	2196 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2197
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2198 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2199 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	2200 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2201 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	2202 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	2203 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2204
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2205 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2206 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	2207 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2208 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	2209 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	2210 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	2211 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2212
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2213 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2214 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	2215 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2216 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	2217 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	2218 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2219
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2220 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2221 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	2222 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2223 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	2224
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2225 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	2226 \|\| 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	2227 \|\| 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	2228 \|\| 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	2229 \|\| 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	2230 \|\| 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	2231 \|\| 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	2232 \|\| 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	2233 \|\| 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	2234 \|\| 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	2235 \|\| 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	2236 \|\| 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	2237 \|\| 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	2238 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2239
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2240 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2241 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	2242 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2243 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	2244 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	2245 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2246
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2247 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2248 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	2249 {
26662 05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	2250 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	2251 return false;
05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	2252
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2253 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	2254 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	2255 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2256
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2257 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2258 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	2259 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2260 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	2261
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2262 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	2263 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	2264 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2265
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2266 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2267 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	2268 {
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22857 diff changeset	2269 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	2270 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	2271 }
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2272 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2273
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2274 static bool
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2275 looks_like_copyright (const std::string& s)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2276 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2277 bool retval = false;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2278
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2279 if (! s.empty ())
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2280 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2281 size_t offset = s.find_first_not_of (" \t");
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2282
23555 9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2283 retval = (s.substr (offset, 9) == "Copyright"
27086 007fcab79721 interpret "SPDX-License-Identifier" comments as copyright headers (bug #56121) Mike Miller <mtmiller@octave.org> parents: 27052 diff changeset	2284 \|\| s.substr (offset, 6) == "Author"
007fcab79721 interpret "SPDX-License-Identifier" comments as copyright headers (bug #56121) Mike Miller <mtmiller@octave.org> parents: 27052 diff changeset	2285 \|\| s.substr (offset, 23) == "SPDX-License-Identifier");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2286 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2287
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2288 return retval;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2289 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2290
23555 9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2291 static bool
9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2292 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	2293 {
9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2294 return ((! s.empty ()) && (s[0] == '!'));
9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2295 }
9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2296
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2297 namespace octave
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2298 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2299 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2300 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	2301 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2302 m_buffer = input;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2303 m_chars_left = m_buffer.length ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2304 m_pos = m_buffer.c_str ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2305 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	2306 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2307
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2308 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2309 base_lexer::input_buffer::copy_chunk (char *buf, size_t max_size)
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 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	2312
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2313 size_t len = max_size > m_chars_left ? m_chars_left : 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	2314 assert (len > 0);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2315
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2316 memcpy (buf, m_pos, len);
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2317
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2318 m_chars_left -= len;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2319 m_pos += len;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2320
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2321 // Make sure input ends with a new line character.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2322 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	2323 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2324 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	2325 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2326 // 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	2327 // the buffer.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2328 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	2329 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2330 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2331 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2332 // There isn't enough room to plug the newline character
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2333 // in the buffer so arrange to have it returned on the next
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2334 // call to base_lexer::read.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2335 m_pos = eol;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2336 m_chars_left = 1;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2337 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2338 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2339
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2340 return len;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2341 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2342
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2343 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	2344 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2345 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	2346 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2347
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2348 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2349 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	2350 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2351 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	2352
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2353 // 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	2354 // flex-generated lexer.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2355 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	2356
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2357 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	2358 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2359
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2360 // 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	2361 // 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	2362 // (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	2363 // 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	2364 // 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	2365
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2366 #define OCTAVE_YYG \
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2367 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	2368
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2369 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2370 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	2371 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2372 // 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	2373 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	2374
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2375 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	2376
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2377 // 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	2378 // input.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2379
27301 a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27086 diff changeset	2380 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	2381 && ! (m_reading_fcn_file
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2382 \|\| m_reading_classdef_file
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2383 \|\| 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	2384 \|\| 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	2385 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	2386
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2387 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	2388
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2389 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	2390 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2391
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2392 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2393 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	2394 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2395 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	2396
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2397 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	2398 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2399
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2400 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2401 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	2402 {
27768 d6701f835496 use filepos object to store beginning position of character strings John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	2403 m_beg_string = 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	2404
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2405 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	2406 }
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 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2409 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	2410 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2411 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	2412
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2413 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	2414 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2415 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	2416
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2417 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	2418 && ! 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	2419 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	2420 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	2421 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2422
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2423 return handle_token (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	2424 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2425
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2426 char *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2427 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	2428 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2429 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	2430 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2431
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2432 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2433 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	2434 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2435 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	2436 }
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 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2439 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	2440 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2441 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	2442
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	2443 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	2444 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2445 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	2446 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	2447 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	2448 }
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 // 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	2451
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2452 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	2453 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2454 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	2455
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	2456 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	2457 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2458 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	2459 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	2460 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	2461 }
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 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	2464 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2465 xunput (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2466 c = '\n';
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 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2469
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2470 return c;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2471 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2472
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2473 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2474 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	2475 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2476 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	2477 {
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	2478 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	2479 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2480 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	2481 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	2482 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	2483 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2484
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2485 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	2486 }
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2489 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2490 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	2491 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2492 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	2493
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2494 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	2495 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2496
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2497 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2498 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	2499 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2500 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	2501 xunput (c);
26710 d6dd07dce2d2 use inline functions for matching whitespace in lexer John W. Eaton <jwe@octave.org> parents: 26709 diff changeset	2502 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	2503 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2504
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2505 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2506 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	2507 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2508 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	2509
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2510 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	2511 {
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22857 diff changeset	2512 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	2513 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2514 retval = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2515 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2516 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2517 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2518
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2519 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2520 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2521
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2522 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2523 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	2524 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	2525 {
26662 05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	2526 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	2527 && 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	2528 \|\| (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	2529 != 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	2530 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2531
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2532 // Handle keywords. Return -1 if the keyword 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	2533
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2534 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2535 base_lexer::is_keyword_token (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	2536 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2537 int len = s.length ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2538
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2539 const octave_kw *kw = octave_kw_hash::in_word_set (s.c_str (), len);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2540
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2541 if (kw)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2542 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2543 bool previous_at_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	2544
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2545 // May be reset to true for some token types.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2546 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	2547
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23787 diff changeset	2548 token *tok_val = nullptr;
22196 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 switch (kw->kw_id)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2551 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2552 case break_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2553 case catch_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2554 case continue_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2555 case else_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2556 case otherwise_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2557 case return_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2558 case unwind_protect_cleanup_kw:
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2559 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	2560 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2561
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2562 case persistent_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2563 case global_kw:
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2564 m_looking_at_decl_list = true;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2565 break;
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 case case_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2568 case elseif_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2569 case until_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2570 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2571
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2572 case end_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2573 if (inside_any_object_index ()
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2574 \|\| (m_defining_func
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2575 && ! (m_looking_at_return_list
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2576 \|\| 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	2577 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2578 m_at_beginning_of_statement = previous_at_bos;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2579 return 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2580 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2581
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2582 tok_val = new token (end_kw, token::simple_end, m_filepos,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2583 m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2584 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	2585 break;
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 case end_try_catch_kw:
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2588 tok_val = new token (end_try_catch_kw, token::try_catch_end,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2589 m_filepos, m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2590 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	2591 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2592
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2593 case end_unwind_protect_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2594 tok_val = new token (end_unwind_protect_kw,
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2595 token::unwind_protect_end, m_filepos,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2596 m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2597 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	2598 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2599
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2600 case endfor_kw:
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2601 tok_val = new token (endfor_kw, token::for_end, m_filepos,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2602 m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2603 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	2604 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2605
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2606 case endfunction_kw:
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2607 tok_val = new token (endfunction_kw, token::function_end,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2608 m_filepos, m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2609 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	2610 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2611
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2612 case endif_kw:
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2613 tok_val = new token (endif_kw, token::if_end, m_filepos, m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2614 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	2615 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2616
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2617 case endparfor_kw:
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2618 tok_val = new token (endparfor_kw, token::parfor_end, m_filepos,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2619 m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2620 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	2621 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2622
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2623 case endswitch_kw:
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2624 tok_val = new token (endswitch_kw, token::switch_end, m_filepos,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2625 m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2626 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	2627 break;
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 case endwhile_kw:
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2630 tok_val = new token (endwhile_kw, token::while_end, m_filepos,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2631 m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2632 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	2633 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2634
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2635 case endclassdef_kw:
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2636 tok_val = new token (endclassdef_kw, token::classdef_end,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2637 m_filepos, m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2638 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	2639 break;
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 case endenumeration_kw:
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2642 tok_val = new token (endenumeration_kw, token::enumeration_end,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2643 m_filepos, m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2644 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	2645 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2646
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2647 case endevents_kw:
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2648 tok_val = new token (endevents_kw, token::events_end, m_filepos,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2649 m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2650 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	2651 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2652
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2653 case endmethods_kw:
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2654 tok_val = new token (endmethods_kw, token::methods_end, m_filepos,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2655 m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2656 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	2657 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2658
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2659 case endproperties_kw:
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2660 tok_val = new token (endproperties_kw, token::properties_end,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2661 m_filepos, m_filepos);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2662 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	2663 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2664
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2665
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2666 case for_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2667 case parfor_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2668 case while_kw:
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2669 m_looping++;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2670 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2671
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2672 case do_kw:
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2673 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	2674 m_looping++;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2675 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2676
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2677 case try_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2678 case unwind_protect_kw:
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2679 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	2680 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2681
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2682 case if_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2683 case switch_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2684 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2685
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2686 case get_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2687 case set_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2688 // 'get' and 'set' are keywords in classdef method
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2689 // declarations.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2690 if (! m_maybe_classdef_get_set_method)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2691 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2692 m_at_beginning_of_statement = previous_at_bos;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2693 return 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2694 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2695 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2696
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2697 case enumeration_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2698 case events_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2699 case methods_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2700 case properties_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2701 // 'properties', 'methods' and 'events' are keywords for
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2702 // classdef blocks.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2703 if (! m_parsing_classdef)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2704 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2705 m_at_beginning_of_statement = previous_at_bos;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2706 return 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2707 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2708 // fall through ...
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2709
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2710 case classdef_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2711 // 'classdef' is always a keyword.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2712 if (! m_force_script && m_token_count == 0 && input_from_file ())
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2713 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2714 m_reading_classdef_file = true;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2715 m_reading_script_file = false;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2716 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2717 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2718
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2719 case function_kw:
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2720 m_defining_func++;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2721 m_parsed_function_name.push (false);
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2722
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2723 if (! m_force_script && m_token_count == 0 && input_from_file ())
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2724 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2725 m_reading_fcn_file = true;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2726 m_reading_script_file = false;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2727 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2728
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2729 if (! (m_reading_fcn_file \|\| m_reading_script_file
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2730 \|\| m_reading_classdef_file))
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	2731 {
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	2732 // Input must be coming from the terminal or stdin?
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2733 m_buffer_function_text = true;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2734 m_function_text += (m_current_input_line + "\n");
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2735
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	2736 // FIXME: do we need to save and restore the file position
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	2737 // or just reset the line number here? The goal is to
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	2738 // track line info for command-line functions relative
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	2739 // to the function keyword.
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	2740 m_filepos.line (1);
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	2741 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2742 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2743
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2744 case magic_file_kw:
18319 f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2745 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2746 if ((m_reading_fcn_file \|\| m_reading_script_file
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2747 \|\| m_reading_classdef_file)
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2748 && ! m_fcn_file_full_name.empty ())
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2749 tok_val = new token (magic_file_kw, m_fcn_file_full_name,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2750 m_filepos, 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	2751 else
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2752 tok_val = new token (magic_file_kw, "stdin", m_filepos,
07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2753 m_filepos);
18319 f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2754 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2755 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2756
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2757 case magic_line_kw:
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	2758 {
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	2759 int l = m_filepos.line ();
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	2760 tok_val = new token (magic_line_kw, static_cast<double> (l),
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2761 "", m_filepos, 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	2762 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2763 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2764
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2765 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2766 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2767 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2768
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2769 if (! tok_val)
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2770 tok_val = new token (kw->tok, true, m_filepos, 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	2771
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2772 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	2773
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2774 return kw->tok;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2775 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2776
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2777 return 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2778 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2779
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2780 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2781 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	2782 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2783 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	2784 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	2785
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2786 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	2787
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2788 do
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2789 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2790 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	2791
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2792 if (p2 != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2793 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2794 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	2795 p1 = p2 + 1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2796 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2797 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2798 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	2799
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2800 if (is_keyword_token (s_part))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2801 return true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2802 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2803 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	2804
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2805 return false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2806 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2807
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2808 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2809 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	2810 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2811 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	2812 \|\| (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	2813 && ! 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	2814 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2815 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2816
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2817 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	2818 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	2819 {
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2820 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	2821 }
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2822
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2823 static inline bool
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2824 looks_like_hex (const char *s, int len)
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2825 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2826 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	2827 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2828
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2829 namespace octave
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	2830 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2831 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2832 base_lexer::handle_number (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2833 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2834 double value = 0.0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2835 int nread = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2836
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2837 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	2838
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2839 // Strip any underscores
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2840 char *tmptxt = strsave (yytxt);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2841 char *rptr = tmptxt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2842 char *wptr = tmptxt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2843 while (*rptr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2844 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2845 wptr = rptr++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2846 wptr += (*wptr != '_');
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2847 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2848 *wptr = '\0';
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2849
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2850 if (looks_like_hex (tmptxt, strlen (tmptxt)))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2851 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2852 uintmax_t long_int_value;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2853
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2854 nread = sscanf (tmptxt, "%jx", &long_int_value);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2855
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2856 value = static_cast<double> (long_int_value);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2857 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2858 else if (looks_like_bin (tmptxt, strlen (tmptxt)))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2859 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2860 uintmax_t long_int_value = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2861
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2862 for (size_t i = 0; i < strlen (tmptxt); i++)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2863 {
23211 08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2864 if (tmptxt[i] == '0')
08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2865 long_int_value <<= 1;
08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2866 else if (tmptxt[i] == '1')
08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2867 {
08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2868 long_int_value <<= 1;
08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2869 long_int_value += 1;
08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2870 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2871 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2872
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2873 value = static_cast<double> (long_int_value);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2874
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2875 nread = 1; // Just to pass the assert stmt below
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2876 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2877 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2878 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2879 char *idx = strpbrk (tmptxt, "Dd");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2880
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2881 if (idx)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2882 *idx = 'e';
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2883
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2884 nread = sscanf (tmptxt, "%lf", &value);
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2887 delete [] tmptxt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2888
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2889 // 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	2890
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2891 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	2892
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2893 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	2894 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	2895
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	2896 push_token (new token (NUM, value, yytxt, m_filepos, 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	2897
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	2898 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	2899 }
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 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2902 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	2903 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2904 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	2905 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	2906
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2907 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	2908 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	2909 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	2910 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2911 offset = 3;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2912
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2913 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	2914 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	2915 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2916 char c = yytxt[offset];
26710 d6dd07dce2d2 use inline functions for matching whitespace in lexer John W. Eaton <jwe@octave.org> parents: 26709 diff changeset	2917 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	2918 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2919 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	2920 offset++;
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 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2923 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2924 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2925
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2926 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	2927 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	2928
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2929 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	2930 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	2931 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2932 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	2933 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	2934 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2935 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	2936 offset++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2937 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2938 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2939 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2940 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2941
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2942 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	2943 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2944 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	2945
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2946 // 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	2947 // 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	2948 // 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	2949
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2950 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	2951
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	2952 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	2953
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2954 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	2955 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2956
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	2957 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	2958 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2959
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2960 void
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	2961 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	2962 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2963 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	2964
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2965 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	2966 && ! 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	2967 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	2968
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2969 if (copyright)
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	2970 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	2971
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2972 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	2973
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2974 m_comment_text = "";
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2975
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2976 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	2977 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2978
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2979 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2980 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	2981 {
25708 ca38400776bc track column count in lexer in a few more places (bug #34852) John W. Eaton <jwe@octave.org> parents: 25646 diff changeset	2982 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	2983
ca38400776bc track column count in lexer in a few more places (bug #34852) John W. Eaton <jwe@octave.org> parents: 25646 diff changeset	2984 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	2985 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	2986
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	2987 m_filepos.increment_column ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2988
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2989 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	2990 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2991 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	2992
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2993 if (bracket_type == ']')
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2994 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	2995 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	2996 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	2997 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2998 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	2999 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3000
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3001 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	3002
25708 ca38400776bc track column count in lexer in a few more places (bug #34852) John W. Eaton <jwe@octave.org> parents: 25646 diff changeset	3003 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	3004 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3005
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3006 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3007 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	3008 {
26662 05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	3009 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	3010 return false;
05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	3011
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3012 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	3013 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	3014
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3015 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	3016 && 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	3017 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3018
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3019 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3020 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	3021 {
26686 581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	3022 std::string txt = flex_yytext ();
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	3023
26708 606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	3024 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	3025 txt.end ());
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	3026
26686 581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	3027 size_t pos = txt.find ("@");
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	3028
26718 9b0335f4bc74 revise naming of the parts of a superclass reference John W. Eaton <jwe@octave.org> parents: 26710 diff changeset	3029 std::string meth = txt.substr (0, pos);
26686 581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	3030 std::string cls = txt.substr (pos + 1);
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	3031
26718 9b0335f4bc74 revise naming of the parts of a superclass reference John W. Eaton <jwe@octave.org> parents: 26710 diff changeset	3032 bool kw_token = (is_keyword_token (meth)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3033 \|\| 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	3034
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3035 if (kw_token)
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3036 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3037 token *tok
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3038 = 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	3039 "method, class, and package names may not be keywords",
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	3040 m_filepos, 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	3041
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3042 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	3043
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3044 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	3045 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3046
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	3047 push_token (new token (SUPERCLASSREF, meth, cls, m_filepos, 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	3048
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	3049 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	3050
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3051 return SUPERCLASSREF;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3052 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3053
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3054 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3055 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	3056 {
26708 606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	3057 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	3058
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	3059 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	3060 txt.end ());
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	3061
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	3062 // Eliminate leading '?'
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	3063 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	3064
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3065 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	3066 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3067 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	3068 "class and package names may not be keywords",
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	3069 m_filepos, 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	3070 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	3071
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3072 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	3073 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3074
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	3075 push_token (new token (METAQUERY, cls, m_filepos, 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	3076
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	3077 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	3078
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3079 return METAQUERY;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3080 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3081
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3082 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3083 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	3084 {
26708 606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	3085 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	3086
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	3087 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	3088 txt.end ());
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	3089
606605d0cd31 allow spaces in FQ_IDENT, SUPERCLASSREF, and METAQUERY tokens in lexer John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	3090 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	3091 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3092 token *tok
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3093 = 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	3094 "function, method, class, and package names may not be keywords",
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	3095 m_filepos, 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	3096
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3097 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	3098
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3099 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	3100 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3101
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	3102 push_token (new token (FQ_IDENT, txt, m_filepos, 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	3103
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	3104 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	3105
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3106 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	3107 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3108
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3109 // 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	3110 // 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	3111 // 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	3112
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3113 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3114 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	3115 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3116 std::string ident = flex_yytext ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3117
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3118 // 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	3119 // 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	3120 // 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	3121
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3122 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	3123 {
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	3124 push_token (new token (STRUCT_ELT, ident, m_filepos, m_filepos));
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3125
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3126 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	3127
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	3128 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	3129
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3130 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	3131 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3132
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3133 // If ident is a keyword token, then is_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	3134 // 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	3135 // 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	3136
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3137 int kw_token = is_keyword_token (ident);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3138
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3139 // 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	3140 // 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	3141
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3142 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	3143 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3144 if (kw_token >= 0)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3145 {
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	3146 m_filepos.increment_column (flex_yyleng ());
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3147 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	3148 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3149
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3150 // The call to is_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	3151
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3152 return kw_token;
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3153 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3154
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3155 // 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	3156
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3157 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	3158
8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	3159 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	3160
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	3161 token *tok = new token (NAME, sr, m_filepos, 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	3162
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3163 // 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	3164 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3165 // pi +1
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3166 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3167 // 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	3168 // 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	3169
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3170 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	3171 && ! (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	3172 \|\| is_variable (ident, scope)
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27578 diff changeset	3173 \|\| ident == "e" \|\| ident == "pi"
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27578 diff changeset	3174 \|\| ident == "I" \|\| ident == "i"
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27578 diff changeset	3175 \|\| ident == "J" \|\| ident == "j"
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27578 diff changeset	3176 \|\| ident == "Inf" \|\| ident == "inf"
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27578 diff changeset	3177 \|\| 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	3178 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	3179
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3180 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	3181
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	3182 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	3183
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3184 // 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	3185
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3186 if (ident != "end")
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3187 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	3188
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3189 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	3190
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3191 return NAME;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3192 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3193
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3194 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3195 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	3196 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3197 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	3198
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3199 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	3200 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	3201 "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	3202 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	3203 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3204 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	3205 "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	3206 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	3207 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3208
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3209 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3210 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	3211 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3212 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	3213
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3214 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	3215 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	3216 "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	3217 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	3218 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3219 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	3220 "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	3221 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	3222 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3223
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3224 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3225 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	3226 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3227 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	3228
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3229 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	3230 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	3231 "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	3232 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	3233 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3234 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	3235 "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	3236 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	3237 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3238
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3239 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3240 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	3241 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3242 if (c == '#')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3243 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	3244 }
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 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3247 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	3248 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3249 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	3250 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3251
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3252 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3253 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	3254 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3255 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	3256 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	3257 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	3258 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	3259 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	3260 }
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 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3263 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	3264 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3265 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	3266 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	3267 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	3268 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3269
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3270 token *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3271 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	3272 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3273 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	3274 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	3275 }
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 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3278 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	3279 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3280 switch (tok)
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3281 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3282 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	3283 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	3284 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	3285 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	3286 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	3287 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	3288 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	3289 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	3290 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	3291 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	3292 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	3293 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	3294 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	3295 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	3296 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	3297 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	3298 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	3299 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	3300 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	3301 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	3302 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	3303 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	3304 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	3305 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	3306 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	3307 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	3308 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	3309 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	3310 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	3311 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	3312 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	3313 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	3314 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	3315 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	3316 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	3317 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	3318 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	3319 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	3320 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	3321 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	3322 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	3323
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3324 case NUM:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3325 case IMAG_NUM:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3326 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3327 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	3328 std::cerr << (tok == NUM ? "NUM" : "IMAG_NUM")
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3329 << " [" << tok_val->number () << "]\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3330 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3331 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3332
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3333 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	3334 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3335 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	3336 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	3337 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3338 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3339
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3340 case NAME:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3341 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3342 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	3343 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	3344 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	3345 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3346 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3347
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3348 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	3349
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3350 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	3351 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	3352 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3353 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	3354
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3355 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	3356 << " [" << 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	3357 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3358 break;
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 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	3361 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	3362 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	3363 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	3364 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	3365 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	3366 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	3367 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	3368 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	3369 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	3370 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	3371 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	3372 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	3373 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	3374 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	3375 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	3376 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	3377 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	3378 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	3379 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	3380 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	3381 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	3382 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	3383 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	3384 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	3385 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	3386 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	3387 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	3388 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	3389 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	3390 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	3391 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	3392 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	3393 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	3394 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	3395 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3396 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3397 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	3398 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	3399 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3400 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	3401 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3402 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3403 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3404 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3405
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3406 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3407 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	3408 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3409 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	3410 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3411
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3412 bool
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3413 base_lexer::debug_flag (void) const
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3414 {
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3415 settings& stgs = m_interpreter.get_settings ();
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3416 return stgs.lexer_debug_flag ();
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3417 }
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3418
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3419 bool
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3420 base_lexer::display_tokens (void) const
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3421 {
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3422 settings& stgs = m_interpreter.get_settings ();
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3423 return stgs.display_tokens ();
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3424 }
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3425
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3426 void
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3427 base_lexer::increment_token_count (void)
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3428 {
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3429 settings& stgs = m_interpreter.get_settings ();
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3430 stgs.increment_token_count ();
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3431
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3432 m_token_count++;
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3433 }
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3434
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3435 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3436 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	3437 {
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3438 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	3439 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3440 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	3441
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3442 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	3443
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3444 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	3445 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	3446 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3447 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3448
25994 f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25719 diff changeset	3449 bool
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25719 diff changeset	3450 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	3451 {
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25719 diff changeset	3452 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	3453
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25719 diff changeset	3454 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	3455 }
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25719 diff changeset	3456
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3457 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3458 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	3459 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3460 OCTAVE_YYG;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3461
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3462 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	3463
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3464 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	3465 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3466
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3467 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3468 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	3469 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3470 OCTAVE_YYG;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3471
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3472 start_state_stack.pop ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 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 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	3475 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3476
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3477 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3478 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	3479 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3480 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	3481 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	3482
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3483 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	3484 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3485
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3486 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3487 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	3488 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3489 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	3490
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3491 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	3492 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3493 case INITIAL:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3494 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	3495 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3496
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3497 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	3498 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	3499 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3500
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3501 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	3502 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	3503 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3504
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3505 case INPUT_FILE_START:
26709 17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3506 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	3507 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3508
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3509 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	3510 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	3511 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3512
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3513 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	3514 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	3515 break;
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 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	3518 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	3519 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3520
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3521 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	3522 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	3523 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3524
26709 17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3525 case FQ_IDENT_START:
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3526 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	3527 break;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3528
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3529 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3530 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	3531 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3532 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3533 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3534
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3535 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3536 base_lexer::handle_op (const char *pattern, int tok, bool bos)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3537 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3538 lexer_debug (pattern);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3539
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3540 return handle_op_internal (tok, bos, true);
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3543 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3544 base_lexer::handle_language_extension_op (const char *pattern, int tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3545 bool bos)
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 lexer_debug (pattern);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3548
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3549 return handle_op_internal (tok, bos, false);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3550 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3551
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3552 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3553 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	3554 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3555 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	3556
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3557 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	3558
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3559 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	3560 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3561 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	3562 xunput (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3563
26710 d6dd07dce2d2 use inline functions for matching whitespace in lexer John W. Eaton <jwe@octave.org> parents: 26709 diff changeset	3564 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	3565
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3566 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	3567 \|\| 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	3568 \|\| ((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	3569 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	3570 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3571
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3572 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	3573 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3574
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3575 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3576 base_lexer::handle_unary_op (int tok, bool bos)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3577 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3578 return maybe_unput_comma_before_unary_op (tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3579 ? -1 : handle_op_internal (tok, bos, true);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3580 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3581
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3582 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3583 base_lexer::handle_language_extension_unary_op (int tok, bool bos)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3584 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3585 return maybe_unput_comma_before_unary_op (tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3586 ? -1 : handle_op_internal (tok, bos, false);
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3589 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3590 base_lexer::handle_op_internal (int tok, bool bos, bool compat)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3591 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3592 if (! compat)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3593 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	3594
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	3595 push_token (new token (tok, m_filepos, 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	3596
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	3597 m_filepos.increment_column (flex_yyleng ());
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3598 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	3599 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	3600
26709 17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3601 switch (tok)
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3602 {
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3603 case EXPR_LT:
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3604 if (m_parsing_classdef_decl)
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3605 {
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3606 m_parsing_classdef_superclass = true;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3607 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	3608 }
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3609 break;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3610
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3611 case EXPR_AND:
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3612 if (m_parsing_classdef_superclass)
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3613 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	3614 break;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3615
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3616 default:
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3617 break;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3618 }
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26708 diff changeset	3619
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3620 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	3621 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3622
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3623 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3624 base_lexer::handle_token (const std::string& name, int tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3625 {
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	3626 token *tok_val = new token (tok, name, m_filepos, 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	3627
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3628 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	3629 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3630
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3631 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3632 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	3633 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3634 if (! tok_val)
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	3635 tok_val = new token (tok, m_filepos, 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	3636
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3637 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	3638
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	3639 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	3640
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3641 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	3642 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3643
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3644 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3645 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	3646 {
27769 07ffed9878ad store begin and end position in tokens John W. Eaton <jwe@octave.org> parents: 27768 diff changeset	3647 token *tok_val = new token (tok, m_filepos, 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	3648
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3649 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	3650
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3651 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	3652 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3653
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3654 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3655 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	3656 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3657 if (tok != '\n')
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3658 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	3659
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3660 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	3661 }
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 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3664 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	3665 {
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3666
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3667 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	3668 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	3669
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3670 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	3671 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3672 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	3673 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	3674 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	3675 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3676
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3677 return tok;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3678 }
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 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3681 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	3682 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3683 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	3684
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3685 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	3686 {
27527 73be3c628eac refactor input_reader class and its use in lexer John W. Eaton <jwe@octave.org> parents: 27526 diff changeset	3687 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	3688
73be3c628eac refactor input_reader class and its use in lexer John W. Eaton <jwe@octave.org> parents: 27526 diff changeset	3689 std::string ps
27528 e51284fc0a51 eliminate promptflag from the lexer and input reader classes John W. Eaton <jwe@octave.org> parents: 27527 diff changeset	3690 = 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	3691
73be3c628eac refactor input_reader class and its use in lexer John W. Eaton <jwe@octave.org> parents: 27526 diff changeset	3692 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	3693
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3694 bool eof = false;
27527 73be3c628eac refactor input_reader class and its use in lexer John W. Eaton <jwe@octave.org> parents: 27526 diff changeset	3695 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	3696
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3697 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	3698
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3699 // 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	3700 // command line.
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3701 //
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3702 // 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	3703 //
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3704 // 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	3705
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3706 if (m_buffer_function_text)
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3707 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3708 if (! m_current_input_line.empty ())
23786 10136bfd46a3 lex.ll: Fix heap-buffer-overflow (bug #51533). Rik <rik@octave.org> parents: 23750 diff changeset	3709 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3710 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	3711 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	3712 m_function_text += '\n';
23786 10136bfd46a3 lex.ll: Fix heap-buffer-overflow (bug #51533). Rik <rik@octave.org> parents: 23750 diff changeset	3713 }
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3714 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3715 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3716
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3717 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	3718 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	3719 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3720 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	3721
27528 e51284fc0a51 eliminate promptflag from the lexer and input reader classes John W. Eaton <jwe@octave.org> parents: 27527 diff changeset	3722 m_initial_input = false;
e51284fc0a51 eliminate promptflag from the lexer and input reader classes John W. Eaton <jwe@octave.org> parents: 27527 diff changeset	3723
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3724 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3725 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3726
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3727 void
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3728 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	3729 {
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3730 // 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	3731 // 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	3732 //
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3733 // Currently, base_lexer::is_keyword_token starts buffering text
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3734 // 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	3735 // 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	3736 // 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	3737 // 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	3738 // 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	3739 // 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	3740 // 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	3741 //
549273db93e4 cache current input line in push lexer John W. Eaton <jwe@octave.org> parents: 27443 diff changeset	3742 // 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	3743 // 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	3744 // 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	3745
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3746 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	3747 m_current_input_line = input;
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3748 }
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3749
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3750 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3751 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	3752 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3753 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	3754
27760 16e83787f970 fix handling of full line comments at command prompt (bug #57208) John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	3755 // If the input buffer is empty or we are at the end of the buffer,
16e83787f970 fix handling of full line comments at command prompt (bug #57208) John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	3756 // insert ASCII 1 as a marker for subsequent rules.
16e83787f970 fix handling of full line comments at command prompt (bug #57208) John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	3757
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3758 if (m_input_buf.empty () && ! m_input_buf.at_eof ())
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3759 m_input_buf.fill (std::string (1, static_cast<char> (1)), false);
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3760
27760 16e83787f970 fix handling of full line comments at command prompt (bug #57208) John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	3761 // Note that the copy_chunk function may append a newline character
16e83787f970 fix handling of full line comments at command prompt (bug #57208) John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	3762 // to the input.
16e83787f970 fix handling of full line comments at command prompt (bug #57208) John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	3763
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3764 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	3765 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	3766 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3767 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	3768
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3769 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3770 }
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3771 }

Mercurial > octave

annotate libinterp/parse-tree/lex.ll @ 27769:07ffed9878ad