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

annotate libinterp/parse-tree/lex.ll @ 21369:105224df2330

also disallow assignment to keywords in assignin (bug #46459) * lex.ll (is_keyword): Don't treat "enumeration", "events", "methods", or "properties" as keywords. * oct-parse.in.yy, parse.h: New tests. (Fassignin): Check for assignments to keywords. (octave_base_parser::valid_id_for_assignment): Delete. (octave_base_parser::make_assign_op): Use is_keyword instead of valid_id_for_assignment.

author	John W. Eaton <jwe@octave.org>
date	Fri, 26 Feb 2016 20:35:45 -0500
parents	db574711df78
children	986dbd769bb1

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
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19596 diff changeset	3 Copyright (C) 1993-2015 John W. Eaton
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	4
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	6
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6547 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6547 diff changeset	10 option) any later version.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	11
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	15 for more details.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	16
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6547 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6547 diff changeset	19 <http://www.gnu.org/licenses/>.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	20
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	21 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	22
16150 891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	23 /*
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	24 We are using the pure parser interface and the reentrant lexer
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	25 interface but the Octave parser and lexer are NOT properly
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	26 reentrant because both still use many global variables. It should be
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 {
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	35 #ifdef HAVE_CONFIG_H
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21294 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)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	40 // This one needs to be global.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	41 #pragma GCC diagnostic ignored "-Wunused-function"
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	42
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	43 // Disable this warning for code that is generated by flex, including
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	44 // pattern rules. Push the current state so we can restore the warning
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	45 // state prior to functions we define at the bottom of the file.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	46 #pragma GCC diagnostic push
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	47 #pragma GCC diagnostic ignored "-Wold-style-cast"
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	48 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	49
21332 db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	50 // 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	51 // potential warnings about it.
db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	52 #if ! defined (register)
db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	53 #define register
db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	54 #endif
db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	55
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	56 }
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	57
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	58 %option prefix = "octave_"
16146 b6050fc0a2d9 use %option noyywrap John W. Eaton <jwe@octave.org> parents: 16139 diff changeset	59 %option noyywrap
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	60 %option reentrant
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	61 %option bison-bridge
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	62
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	63 %option noyyalloc
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	64 %option noyyrealloc
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	65 %option noyyfree
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	66
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	67 %x COMMAND_START
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	68 %s MATRIX_START
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	69
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	70 %x INPUT_FILE_START
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	71
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	72 %x BLOCK_COMMENT_START
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	73 %x LINE_COMMENT_START
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	74
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	75 %x DQ_STRING_START
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	76 %x SQ_STRING_START
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	77
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	78 %x FQ_IDENT_START
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	79
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	80 %{
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 216 diff changeset	81
1341 e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	82 #include <cctype>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	83 #include <cstring>
20589 7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	84 #include <stdint.h>
1341 e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	85
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	86 #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	87 #include <set>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5615 diff changeset	88 #include <sstream>
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	89 #include <string>
4214 b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe] jwe parents: 4208 diff changeset	90 #include <stack>
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	91
4093 5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4064 diff changeset	92 #include <sys/types.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4064 diff changeset	93 #include <unistd.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4064 diff changeset	94
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2900 diff changeset	95 #include "cmd-edit.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4131 diff changeset	96 #include "quit.h"
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	97 #include "lo-mappers.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2900 diff changeset	98
16154 aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment. John W. Eaton <jwe@octave.org> parents: 16150 diff changeset	99 // 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	100 // 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	101 // 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	102 // 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	103 // times.
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	104
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	105 #include "Cell.h"
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	106 #include "comment-list.h"
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2167 diff changeset	107 #include "defun.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	108 #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	109 #include "errwarn.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1341 diff changeset	110 #include "input.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	111 #include "lex.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	112 #include "ov.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	113 #include "parse.h"
2987 ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe] jwe parents: 2982 diff changeset	114 #include "pt-all.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	115 #include "symtab.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	116 #include "token.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	117 #include "toplev.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	118 #include "utils.h"
94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	119 #include "variables.h"
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9476 diff changeset	120 #include <oct-parse.h>
2492 06595bc7f2d0 [project @ 1996-11-09 00:13:50 by jwe] jwe parents: 2375 diff changeset	121 #include <oct-gperf.h>
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	122
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	123 // 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	124 // 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	125 // 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	126 // 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	127 // 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	128 // in the generated oct-parse.h file.
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	129
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	130 #if defined (OCTAVE_STYPE_IS_DECLARED) && ! defined YYSTYPE
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	131 #define YYSTYPE OCTAVE_STYPE
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	132 #endif
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	133
10426 4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	134 #if defined (GNULIB_NAMESPACE)
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	135 // Calls to the following functions appear in the generated output from
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	136 // flex without the namespace tag. Redefine them so we will use them
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	137 // via the gnulib namespace.
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	138 #define fprintf GNULIB_NAMESPACE::fprintf
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	139 #define fwrite GNULIB_NAMESPACE::fwrite
14161 f4b5a2f899d3 check in change accidentally omitted from previuos changeset John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	140 #define isatty GNULIB_NAMESPACE::isatty
10426 4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	141 #define malloc GNULIB_NAMESPACE::malloc
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	142 #define realloc GNULIB_NAMESPACE::realloc
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	143 #endif
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	144
2716 2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	145 #if ! (defined (FLEX_SCANNER) \
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	146 && defined (YY_FLEX_MAJOR_VERSION) && YY_FLEX_MAJOR_VERSION >= 2 \
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	147 && defined (YY_FLEX_MINOR_VERSION) && YY_FLEX_MINOR_VERSION >= 5)
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	148 #error lex.l requires flex version 2.5.4 or later
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	149 #endif
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	150
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	151 #define YY_EXTRA_TYPE octave_base_lexer *
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	152 #define curr_lexer yyextra
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	153
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	154 // Arrange to get input via readline.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	155
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	156 #ifdef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	157 #undef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	158 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	159 #define YY_INPUT(buf, result, max_size) \
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	160 result = curr_lexer->fill_flex_buffer (buf, max_size)
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	161
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	162 // Try to avoid crashing out completely on fatal scanner errors.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	163
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	164 #ifdef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	165 #undef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	166 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	167 #define YY_FATAL_ERROR(msg) \
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	168 (yyget_extra (yyscanner))->fatal_error (msg)
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	169
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	170 #define CMD_OR_OP(PATTERN, TOK, COMPAT) \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	171 \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	172 do \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	173 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	174 curr_lexer->lexer_debug (PATTERN); \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	175 \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	176 if (curr_lexer->looks_like_command_arg ()) \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	177 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	178 yyless (0); \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	179 curr_lexer->push_start_state (COMMAND_START); \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	180 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	181 else \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	182 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	183 return curr_lexer->handle_op_internal (TOK, false, COMPAT); \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	184 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	185 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	186 while (0)
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	187
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	188 #define CMD_OR_COMPUTED_ASSIGN_OP(PATTERN, TOK) \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	189 \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	190 do \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	191 { \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	192 curr_lexer->lexer_debug (PATTERN); \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	193 \
19285 a3eead909bf9 fix error with command parsing (bug #43470) John W. Eaton <jwe@octave.org> parents: 18975 diff changeset	194 if (curr_lexer->previous_token_may_be_command () \
a3eead909bf9 fix error with command parsing (bug #43470) John W. Eaton <jwe@octave.org> parents: 18975 diff changeset	195 && curr_lexer->space_follows_previous_token ()) \
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	196 { \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	197 yyless (0); \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	198 curr_lexer->push_start_state (COMMAND_START); \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	199 } \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	200 else \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	201 { \
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	202 return curr_lexer->handle_language_extension_op (PATTERN, TOK, \
e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	203 false); \
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	204 } \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	205 } \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	206 while (0)
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	207
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	208 #define CMD_OR_UNARY_OP(PATTERN, TOK, COMPAT) \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	209 \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	210 do \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	211 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	212 curr_lexer->lexer_debug (PATTERN); \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	213 \
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	214 if (curr_lexer->previous_token_may_be_command ()) \
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	215 { \
16788 f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	216 if (curr_lexer->looks_like_command_arg ()) \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	217 { \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	218 yyless (0); \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	219 curr_lexer->push_start_state (COMMAND_START); \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	220 } \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	221 else \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	222 { \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	223 return curr_lexer->handle_op_internal (TOK, false, COMPAT); \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	224 } \
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	225 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	226 else \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	227 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	228 int tok \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	229 = (COMPAT \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	230 ? curr_lexer->handle_unary_op (TOK) \
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	231 : curr_lexer->handle_language_extension_unary_op (TOK)); \
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	232 \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	233 if (tok < 0) \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	234 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	235 yyless (0); \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	236 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	237 /* Adjust for comma that was not really in the input stream. */ \
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	238 curr_lexer->current_input_column--; \
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	239 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	240 else \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	241 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	242 return tok; \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	243 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	244 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	245 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	246 while (0)
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	247
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	248 // 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	249 // 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	250 // 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	251 // 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	252 // 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	253 // the current buffer.
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	254 #define HANDLE_STRING_CONTINUATION \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	255 do \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	256 { \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	257 curr_lexer->decrement_promptflag (); \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	258 curr_lexer->input_line_number++; \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	259 curr_lexer->current_input_column = 1; \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	260 \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	261 if (curr_lexer->is_push_lexer ()) \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	262 { \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	263 if (curr_lexer->at_end_of_buffer ()) \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	264 return -1; \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	265 \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	266 if (curr_lexer->at_end_of_file ()) \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	267 return curr_lexer->handle_end_of_input (); \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	268 } \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	269 } \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	270 while (0)
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	271
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	272 // 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	273 // 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	274 // candidate for a function call.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	275
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	276 #define COMMAND_ARG_FINISH \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	277 do \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	278 { \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	279 if (curr_lexer->string_text.empty ()) \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	280 break; \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	281 \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	282 int retval = curr_lexer->handle_token (curr_lexer->string_text, \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	283 SQ_STRING); \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	284 \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	285 curr_lexer->string_text = ""; \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	286 curr_lexer->command_arg_paren_count = 0; \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	287 \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	288 yyless (0); \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	289 \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	290 return retval; \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	291 } \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	292 while (0)
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	293
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	294 #define HANDLE_IDENTIFIER(pattern, get_set) \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	295 do \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	296 { \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	297 curr_lexer->lexer_debug (pattern); \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	298 \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	299 int tok = curr_lexer->previous_token_value (); \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	300 \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	301 if (curr_lexer->whitespace_is_significant () \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	302 && curr_lexer->space_follows_previous_token () \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	303 && ! (tok == '[' \|\| tok == '{' \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	304 \|\| curr_lexer->previous_token_is_binop ())) \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	305 { \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	306 yyless (0); \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	307 unput (','); \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	308 } \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	309 else \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	310 { \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	311 if (! curr_lexer->looking_at_decl_list \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	312 && curr_lexer->previous_token_may_be_command ()) \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	313 { \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	314 yyless (0); \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	315 curr_lexer->push_start_state (COMMAND_START); \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	316 } \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	317 else \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	318 { \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	319 if (get_set) \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	320 curr_lexer->maybe_classdef_get_set_method = false; \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	321 \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	322 int id_tok = curr_lexer->handle_identifier (); \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	323 \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	324 if (id_tok >= 0) \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	325 return curr_lexer->count_token_internal (id_tok); \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	326 } \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	327 } \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	328 } \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	329 while (0)
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	330
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	331 static bool Vdisplay_tokens = false;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	332
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	333 static unsigned int Vtoken_count = 0;
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	334
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	335 // Internal variable for lexer debugging state.
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	336 static bool lexer_debug_flag = false;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	337
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	338 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	339
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	340 D [0-9]
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	341 D_ [0-9_]
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	342 S [ \t]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	343 NL ((\n)\|(\r)\|(\r\n))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	344 Im [iIjJ]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	345 CCHAR [#%]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	346 IDENT ([_$a-zA-Z][_$a-zA-Z0-9]*)
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	347 FQIDENT ({IDENT}(\.{IDENT})*)
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	348 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	349 NUMBIN (0[bB][01_]+)
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	350 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	351 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	352 NUMBER ({NUMREAL}\|{NUMHEX}\|{NUMBIN})
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	353
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	354 ANY_EXCEPT_NL [^\r\n]
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	355 ANY_INCLUDING_NL (.\|{NL})
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	356
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	357 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	358
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	359 %{
20835 14cd86258b3d use 'invalid' instead of 'bogus' in source files John W. Eaton <jwe@octave.org> parents: 20812 diff changeset	360 // 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	361 // the parser go down a special path.
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	362 %}
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	363
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	364 <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	365 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	366
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	367 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	368
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	369 // 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	370 // as the first token.
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	371 curr_lexer->reading_script_file = true;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	372
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	373 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	374
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	375 return curr_lexer->show_token (INPUT_FILE);
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	376 }
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	377
18774 4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	378 <INPUT_FILE_START><<EOF>> {
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	379 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	380
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	381 // 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	382 // as the first token.
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	383 curr_lexer->reading_script_file = true;
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	384
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	385 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	386
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	387 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	388 }
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	389
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	390 %{
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	391 // Help and other command-style functions.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	392 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	393
18224 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 // 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	396 // 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	397 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	398
18312 7ac2a8b758fc maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18247 18311 diff changeset	399 <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	400 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	401
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	402 COMMAND_ARG_FINISH;
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 curr_lexer->input_line_number++;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	405 curr_lexer->current_input_column = 1;
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 HANDLE_STRING_CONTINUATION;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	408 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	409
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 // 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	412 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	413
18312 7ac2a8b758fc maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18247 18311 diff changeset	414 <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	415 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	416
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	417 COMMAND_ARG_FINISH;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	418
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	419 curr_lexer->input_line_number++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	420 curr_lexer->current_input_column = 1;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	421 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	422 curr_lexer->at_beginning_of_statement = true;
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	423 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	424
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	425 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	426 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	427
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	428 <COMMAND_START>[\,\;] {
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	429 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	430
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	431 if (yytext[0] != ',' \|\| curr_lexer->command_arg_paren_count == 0)
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	432 {
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	433 COMMAND_ARG_FINISH;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	434 curr_lexer->looking_for_object_index = false;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	435 curr_lexer->at_beginning_of_statement = true;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	436 curr_lexer->pop_start_state ();
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	437 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	438 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	439 else
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	440 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	441
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	442 curr_lexer->current_input_column += yyleng;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	443 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	444
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	445 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	446 // 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	447 // 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	448 // 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	449 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	450
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	451 <COMMAND_START>[\(\[\{]* {
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	452 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	453
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	454 curr_lexer->command_arg_paren_count += yyleng;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	455 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	456 curr_lexer->current_input_column += yyleng;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	457 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	458
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	459 <COMMAND_START>[\)\]\}]* {
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	460 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	461
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	462 curr_lexer->command_arg_paren_count -= yyleng;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	463 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	464 curr_lexer->current_input_column += yyleng;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	465 }
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 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	468 // 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	469 // 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	470 // text. For instance,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	471 //
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	472 // command 'text1'"text2"
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	473 //
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	474 // 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	475 // 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	476 // 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	477 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	478
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	479 <COMMAND_START>[\"\'] {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	480 curr_lexer->lexer_debug ("<COMMAND_START>[\\\"\\']");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	481
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	482 if (curr_lexer->command_arg_paren_count == 0)
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	483 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	484 ? 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	485 else
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	486 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	487
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	488 curr_lexer->current_input_column += yyleng;
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	489 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	490
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	491 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	492 // 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	493 // 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	494 // incorporated into the argument.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	495 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	496
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	497 <COMMAND_START>{S}* {
af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	498 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	499
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	500 if (curr_lexer->command_arg_paren_count == 0)
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	501 COMMAND_ARG_FINISH;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	502 else
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	503 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	504
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	505 curr_lexer->current_input_column += yyleng;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	506 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	507
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	508 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	509 // 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	510 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	511
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	512 <COMMAND_START>([\.]\|[^#% \t\r\n\.\,\;\"\'$\[\{\}\]$]*) {
18458 ebb878596bcf Restore escaped backslashes accidentally deleted by cset af8a70d6885c Mike Miller <mtmiller@ieee.org> parents: 18437 diff changeset	513 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	514
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	515 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	516 curr_lexer->current_input_column += yyleng;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	517 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	518
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	519 <MATRIX_START>{S}* {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	520 curr_lexer->lexer_debug ("<MATRIX_START>{S}*");
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	521
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	522 curr_lexer->mark_previous_token_trailing_space ();
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	523 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	524
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	525 <MATRIX_START>{NL} {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	526 curr_lexer->lexer_debug ("<MATRIX_START>{NL}");
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	527
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	528 curr_lexer->input_line_number++;
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	529 curr_lexer->current_input_column = 1;
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	530
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	531 if (curr_lexer->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	532 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	533 else
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	534 {
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	535 int tok = curr_lexer->previous_token_value ();
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	536
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	537 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	538 {
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	539 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	540 // Adjust for semicolon that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	541 curr_lexer->current_input_column--;
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	542 }
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	543 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	544 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	545
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	546 %{
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	547 // 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	548 // need to know if the next token is '=' or '=='.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	549 //
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	550 // 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	551 // 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	552 // operator.
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	553 //
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	554 // 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	555 // after seeing a ']' character...
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	556
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17744 diff changeset	557 // FIXME: we need to handle block comments here.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	558 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	559
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	560 <MATRIX_START>\] {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	561 curr_lexer->lexer_debug ("<MATRIX_START>\\]");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	562
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	563 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	564
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	565 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	566 curr_lexer->at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	567
16299 c40a8873c2e7 eliminate some unused variables John W. Eaton <jwe@octave.org> parents: 16294 diff changeset	568 curr_lexer->handle_close_bracket (']');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	569
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	570 return curr_lexer->count_token (']');
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	571 }
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	572
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	573 %{
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17744 diff changeset	574 // 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	575 %}
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	576
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	577 <MATRIX_START>\} {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	578 curr_lexer->lexer_debug ("<MATRIX_START>\\}*");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	579
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	580 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	581
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	582 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	583 curr_lexer->at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	584
16299 c40a8873c2e7 eliminate some unused variables John W. Eaton <jwe@octave.org> parents: 16294 diff changeset	585 curr_lexer->handle_close_bracket ('}');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	586
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	587 return curr_lexer->count_token ('}');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	588 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	589
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	590 \[ {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	591 curr_lexer->lexer_debug ("\\[");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	592
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	593 bool unput_comma = false;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	594
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	595 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	596 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	597 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	598 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	599
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	600 if (! (tok == '[' \|\| tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	601 \|\| curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	602 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	603 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	604
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	605 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	606 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	607 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	608 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	609 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	610 curr_lexer->current_input_column--;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	611 }
5615 d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe] jwe parents: 5570 diff changeset	612 else
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	613 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	614 curr_lexer->nesting_level.bracket ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	615
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	616 curr_lexer->looking_at_object_index.push_front (false);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	617
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	618 curr_lexer->current_input_column += yyleng;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	619 curr_lexer->looking_for_object_index = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	620 curr_lexer->at_beginning_of_statement = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	621
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	622 if (curr_lexer->defining_func
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	623 && ! curr_lexer->parsed_function_name.top ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	624 curr_lexer->looking_at_return_list = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	625 else
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	626 curr_lexer->looking_at_matrix_or_assign_lhs = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	627
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	628 curr_lexer->decrement_promptflag ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	629
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	630 curr_lexer->bracketflag++;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	631
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	632 curr_lexer->push_start_state (MATRIX_START);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	633
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	634 return curr_lexer->count_token ('[');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	635 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	636 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	637
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	638 \] {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	639 curr_lexer->lexer_debug ("\\]");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	640
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	641 curr_lexer->nesting_level.remove ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	642
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	643 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	644
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	645 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	646 curr_lexer->at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	647
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	648 return curr_lexer->handle_token (']');
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	649 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	650
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	651 %{
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	652 // Gobble comments.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	653 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	654
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	655 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	656 // Start of a block comment. If the comment marker appears immediately
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	657 // after a block of full-line comments, finish the full line comment
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	658 // block.
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 ^{S}{CCHAR}\{{S}{NL} {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	662 curr_lexer->lexer_debug ("^{S}{CCHAR}\\{{S}{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	663
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	664 yyless (0);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	665
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	666 if (curr_lexer->start_state () == LINE_COMMENT_START)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	667 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	668 if (! curr_lexer->comment_text.empty ())
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	669 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	670
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	671 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	672 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	673
16365 8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	674 curr_lexer->decrement_promptflag ();
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	675
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	676 curr_lexer->push_start_state (BLOCK_COMMENT_START);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	677
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	678 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	679
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	680 <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	681 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	682
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	683 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	684 curr_lexer->current_input_column = 1;
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 if (curr_lexer->block_comment_nesting_level)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	687 curr_lexer->comment_text = "\n";
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	688
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	689 curr_lexer->block_comment_nesting_level++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	690 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	691
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	692 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	693 // End of a block comment. If this block comment is nested inside
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	694 // another, wait for the outermost block comment block to be closed
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	695 // before storing the comment.
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 <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	699 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	700
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	701 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	702 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	703
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	704 if (curr_lexer->block_comment_nesting_level > 1)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	705 curr_lexer->comment_text = "\n";
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	706 else
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	707 curr_lexer->finish_comment (octave_comment_elt::block);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	708
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	709 curr_lexer->block_comment_nesting_level--;
16364 1e064963c90a properly recognize nested block comments John W. Eaton <jwe@octave.org> parents: 16363 diff changeset	710
1e064963c90a properly recognize nested block comments John W. Eaton <jwe@octave.org> parents: 16363 diff changeset	711 if (curr_lexer->block_comment_nesting_level == 0)
16365 8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	712 {
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	713 curr_lexer->increment_promptflag ();
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	714
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	715 curr_lexer->pop_start_state ();
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	716 }
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	717 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	718
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	719 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	720 // Body of a block comment.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	721 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	722
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	723 <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	724 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	725
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	726 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	727 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	728 curr_lexer->comment_text += yytext;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	729 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	730
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	731 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	732 // Full-line or end-of-line comment.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	733 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	734
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	735 {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	736 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	737
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	738 curr_lexer->push_start_state (LINE_COMMENT_START);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	739 yyless (0);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	740 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 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
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	745 bool full_line_comment = curr_lexer->current_input_column == 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	746 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	747 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	748
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	749 bool have_space = false;
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	750 size_t len = yyleng;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	751 size_t i = 0;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	752 while (i < len)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	753 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	754 char c = yytext[i];
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	755 if (c == ' ' \|\| c == '\t')
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	756 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	757 have_space = true;
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	758 i++;
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	759 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	760 else
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	761 break;
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	762 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	763
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	764 size_t num_comment_chars = 0;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	765
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	766 while (i < len)
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	767 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	768 char c = yytext[i];
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	769 if (c == '#' \|\| c == '%')
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	770 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	771 num_comment_chars++;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	772 i++;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	773 }
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	774 else
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	775 break;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	776 }
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	777
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	778 curr_lexer->comment_text += &yytext[i];
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	779
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	780 if (full_line_comment)
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	781 {
17882 cf3f828f401c only allow [%#]{ as block comment start (bug #40513) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	782 if (num_comment_chars == 1 && yytext[i++] == '{')
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	783 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	784 bool looks_like_block_comment = true;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	785
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	786 while (i < len)
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	787 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	788 char c = yytext[i++];
18135 7af19113ec43 Fix block comments for files with CRLF line endings (bug #40894) John Donoghue <john.donoghue@ieee.org> parents: 17882 diff changeset	789 if (! (c == ' ' \|\| c == '\t' \|\| c == '\n' \|\| c == '\r'))
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	790 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	791 looks_like_block_comment = false;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	792 break;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	793 }
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	794 }
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	795
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	796 if (looks_like_block_comment)
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	797 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	798 yyless (0);
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	799
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	800 curr_lexer->finish_comment (octave_comment_elt::full_line);
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	801
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	802 curr_lexer->pop_start_state ();
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	803 }
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	804 }
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	805 }
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	806 else
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	807 {
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	808 if (have_space)
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	809 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	810
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	811 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	812
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	813 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	814
6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549) John W. Eaton <jwe@octave.org> parents: 16334 diff changeset	815 curr_lexer->xunput ('\n');
6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549) John W. Eaton <jwe@octave.org> parents: 16334 diff changeset	816 curr_lexer->input_line_number--;
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	817 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	818 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	819
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	820 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	821 // End of a block of full-line comments.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	822 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	823
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	824 <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	825 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	826
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	827 curr_lexer->xunput (yytext[0]);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	828
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	829 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	830
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	831 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	832 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	833
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	834 %{
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	835 // End of a block of full-line comments.
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	836 %}
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	837
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	838 <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	839 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	840
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	841 curr_lexer->finish_comment (octave_comment_elt::full_line);
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	842
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	843 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	844 }
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	845
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	846 %{
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	847 // Double-quoted character strings.
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	848 %}
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	849
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	850 <DQ_STRING_START>\"\" {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	851 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	852
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	853 curr_lexer->current_input_column += yyleng;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	854 curr_lexer->string_text += '"';
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	855 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	856
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	857 <DQ_STRING_START>\" {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	858 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	859
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	860 curr_lexer->current_input_column++;
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	861
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	862 curr_lexer->pop_start_state ();
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	863
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	864 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	865 {
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	866 curr_lexer->looking_for_object_index = true;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	867 curr_lexer->at_beginning_of_statement = false;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	868
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	869 curr_lexer->push_token (new token (DQ_STRING,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	870 curr_lexer->string_text,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	871 curr_lexer->string_line,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	872 curr_lexer->string_column));
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	873
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	874 curr_lexer->string_text = "";
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	875
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	876 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	877 }
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	878 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	879
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	880 <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	881 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	882
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	883 curr_lexer->current_input_column += yyleng;
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	884
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	885 int result;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	886 sscanf (yytext+1, "%o", &result);
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	887
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	888 if (result > 0xff)
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	889 {
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	890 token *tok
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	891 = new token (LEXICAL_ERROR,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	892 "invalid octal escape sequence in character string",
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	893 curr_lexer->input_line_number,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	894 curr_lexer->current_input_column);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	895
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	896 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	897
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	898 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	899 }
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	900 else
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	901 curr_lexer->string_text += static_cast<unsigned char> (result);
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	902 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	903
17244 9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	904 <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	905 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	906
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	907 curr_lexer->current_input_column += yyleng;
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	908
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	909 int result;
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	910 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	911
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	912 // 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	913 // 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	914 // 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	915 // it exceeds the range of the character type.
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	916 curr_lexer->string_text += static_cast<unsigned char> (result);
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	917 }
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	918
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	919 <DQ_STRING_START>"\\a" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	920 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	921
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	922 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	923 curr_lexer->string_text += '\a';
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
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	926 <DQ_STRING_START>"\\b" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	927 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	928
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	929 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	930 curr_lexer->string_text += '\b';
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
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	933 <DQ_STRING_START>"\\f" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	934 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	935
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	936 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	937 curr_lexer->string_text += '\f';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	938 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	939
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	940 <DQ_STRING_START>"\\n" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	941 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\n\"");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	942
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	943 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	944 curr_lexer->string_text += '\n';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	945 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	946
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	947 <DQ_STRING_START>"\\r" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	948 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\r\"");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	949
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	950 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	951 curr_lexer->string_text += '\r';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	952 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	953
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	954 <DQ_STRING_START>"\\t" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	955 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	956
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	957 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	958 curr_lexer->string_text += '\t';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	959 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	960
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	961 <DQ_STRING_START>"\\v" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	962 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	963
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	964 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	965 curr_lexer->string_text += '\v';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	966 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	967
18428 4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415). Stefan Mahr <dac922@gmx.de> parents: 18319 diff changeset	968 <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	969 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	970
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	971 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	972
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	973 std::string nm = curr_lexer->fcn_file_full_name;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	974
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	975 if (nm.empty ())
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	976 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	977 else
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	978 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	979 "%s; near line %d of file '%s'", msg,
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	980 curr_lexer->input_line_number, nm.c_str ());
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	981
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	982 HANDLE_STRING_CONTINUATION;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	983 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	984
18428 4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415). Stefan Mahr <dac922@gmx.de> parents: 18319 diff changeset	985 <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	986 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	987
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	988 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	989
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	990 std::string nm = curr_lexer->fcn_file_full_name;
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 if (nm.empty ())
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	993 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	994 else
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	995 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	996 "%s; near line %d of file '%s'", msg,
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	997 curr_lexer->input_line_number, nm.c_str ());
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	998
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	999 HANDLE_STRING_CONTINUATION;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1000 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1001
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1002 <DQ_STRING_START>\\{NL} {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1003 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	1004
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1005 HANDLE_STRING_CONTINUATION;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1006 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1007
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1008 <DQ_STRING_START>\\. {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1009 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	1010
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1011 curr_lexer->current_input_column += yyleng;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1012 curr_lexer->string_text += yytext[1];
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1013 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1014
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1015 <DQ_STRING_START>\. {
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1016 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	1017
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1018 curr_lexer->current_input_column++;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1019 curr_lexer->string_text += yytext[0];
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1020 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1021
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1022 <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	1023 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	1024
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1025 curr_lexer->current_input_column += yyleng;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1026 curr_lexer->string_text += yytext;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1027 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1028
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1029 <DQ_STRING_START>{NL} {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1030 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	1031
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1032 token *tok = new token (LEXICAL_ERROR,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1033 "unterminated character string constant",
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1034 curr_lexer->input_line_number,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1035 curr_lexer->current_input_column);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1036
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1037 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1038
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1039 curr_lexer->input_line_number++;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1040 curr_lexer->current_input_column = 1;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1041
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1042 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	1043 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1044
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1045 %{
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1046 // Single-quoted character strings.
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1047 %}
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1048
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1049 <SQ_STRING_START>\'\' {
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>\\'\\'");
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1051
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1052 curr_lexer->current_input_column += yyleng;
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1053 curr_lexer->string_text += '\'';
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1054 }
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1055
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1056 <SQ_STRING_START>\' {
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1057 curr_lexer->lexer_debug ("<SQ_STRING_START>\\'");
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1058
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1059 curr_lexer->current_input_column++;
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1060
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1061 curr_lexer->pop_start_state ();
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1062
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1063 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	1064 {
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1065 curr_lexer->looking_for_object_index = true;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1066 curr_lexer->at_beginning_of_statement = false;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1067
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1068 curr_lexer->push_token (new token (SQ_STRING,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1069 curr_lexer->string_text,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1070 curr_lexer->string_line,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1071 curr_lexer->string_column));
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1072
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1073 curr_lexer->string_text = "";
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1074
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1075 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	1076 }
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1077 }
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1078
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1079 <SQ_STRING_START>[^\'\n\r]+ {
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1080 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	1081
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1082 curr_lexer->current_input_column += yyleng;
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1083 curr_lexer->string_text += yytext;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1084 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1085
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1086 <SQ_STRING_START>{NL} {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1087 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	1088
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1089 token *tok = new token (LEXICAL_ERROR,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1090 "unterminated character string constant",
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1091 curr_lexer->input_line_number,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1092 curr_lexer->current_input_column);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1093
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1094 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1095
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1096 curr_lexer->input_line_number++;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1097 curr_lexer->current_input_column = 1;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1098
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1099 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	1100 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1101
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1102 %{
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1103 // Fully-qualified identifiers (used for classdef).
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1104 %}
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1105
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1106 <FQ_IDENT_START>{FQIDENT} {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1107 curr_lexer->lexer_debug ("<FQ_IDENT_START>{FQIDENT}");
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1108 curr_lexer->pop_start_state ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1109
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1110 int id_tok = curr_lexer->handle_fq_identifier ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1111
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1112 if (id_tok >= 0)
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 curr_lexer->looking_for_object_index = true;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1115
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1116 return curr_lexer->count_token_internal (id_tok);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1117 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1118 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1119
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1120 <FQ_IDENT_START>{S}+ {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1121 curr_lexer->current_input_column += yyleng;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1122
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1123 curr_lexer->mark_previous_token_trailing_space ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1124 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1125
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1126 <FQ_IDENT_START>. {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1127 yyless (0);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1128 curr_lexer->pop_start_state ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1129 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1130
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1131 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1132 // Imaginary numbers.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1133 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1134
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1135 {NUMBER}{Im} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1136 curr_lexer->lexer_debug ("{NUMBER}{Im}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1137
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1138 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	1139 && curr_lexer->space_follows_previous_token ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1140 {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1141 yyless (0);
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1142 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	1143 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1144 else
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1145 {
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1146 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	1147
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1148 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	1149 && 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	1150 && ! (tok == '[' \|\| tok == '{'
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1151 \|\| 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	1152 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1153 yyless (0);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1154 unput (',');
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1155 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1156 else
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1157 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1158 curr_lexer->handle_number ();
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1159 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	1160 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1161 }
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1162 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1163
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1164 %{
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	1165 // 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	1166 // the constant.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1167 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1168
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	1169 {D}{D_}/\.[\/\\^\'] \|
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1170 {NUMBER} {
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	1171 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	1172
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1173 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	1174 && 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	1175 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1176 yyless (0);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1177 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	1178 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1179 else
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1180 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1181 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	1182
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1183 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	1184 && 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	1185 && ! (tok == '[' \|\| tok == '{'
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1186 \|\| 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	1187 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1188 yyless (0);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1189 unput (',');
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1190 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1191 else
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1192 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1193 curr_lexer->handle_number ();
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1194 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	1195 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1196 }
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1197 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1198
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1199 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1200 // 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	1201 // the <MATRIX_START> start state code above.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1202 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1203
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	1204 {S}+ {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1205 curr_lexer->current_input_column += yyleng;
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	1206
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	1207 curr_lexer->mark_previous_token_trailing_space ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1208 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1209
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1210 %{
17247 e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1211 // 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	1212 %}
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1213
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	1214 \.\.\.{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	1215 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	1216
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1217 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	1218 }
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1219
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1220 %{
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1221 // Deprecated C preprocessor style continuation markers.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1222 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1223
17246 8be8a65d3ca8 Ignore anything after the continuation marker '...' (bug #38653) Stefan Mahr <dac922@gmx.de> parents: 17244 diff changeset	1224 \\{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	1225 \\{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	1226 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	1227
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1228 static const char *msg = "using continuation marker \\ outside of double quoted strings is deprecated and will be removed in a future version of Octave";
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1229
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1230 std::string nm = curr_lexer->fcn_file_full_name;
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1231
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1232 if (nm.empty ())
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1233 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	1234 else
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1235 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	1236 "%s; near line %d of file '%s'", msg,
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1237 curr_lexer->input_line_number, nm.c_str ());
17343 6470a113eae2 correctly handle deprecated \ continuation markers John W. Eaton <jwe@octave.org> parents: 17247 diff changeset	1238
6470a113eae2 correctly handle deprecated \ continuation markers John W. Eaton <jwe@octave.org> parents: 17247 diff changeset	1239 curr_lexer->handle_continuation ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1240 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1241
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 // End of file.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1244 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1245
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1246 <<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	1247 return curr_lexer->handle_end_of_input ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1248 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1249
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1250 %{
16259 0b5ab09dfce4 2/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16257 diff changeset	1251 // 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	1252
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1253 // 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	1254 // followed by "(".
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1255 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1256
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	1257 (set\|get)/{S}*\( {
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1258 HANDLE_IDENTIFIER ("(set\|get)/{S}*\\(", true);
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1259 }
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1260
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1261 {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	1262 HANDLE_IDENTIFIER ("{IDENT}", false);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1263 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1264
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1265 %{
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1266 // Superclass method identifiers.
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1267 %}
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1268
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1269 {IDENT}@{FQIDENT} {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1270 curr_lexer->lexer_debug ("{IDENT}@{FQIDENT}");
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1271
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1272 if (curr_lexer->previous_token_may_be_command ())
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1273 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1274 yyless (0);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1275 curr_lexer->push_start_state (COMMAND_START);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1276 }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1277 else
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1278 {
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1279 int id_tok = curr_lexer->handle_superclass_identifier ();
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1280
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1281 if (id_tok >= 0)
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1282 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1283 curr_lexer->looking_for_object_index = true;
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1284
16683 e1c6ad54259f maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16645 16681 diff changeset	1285 return curr_lexer->count_token_internal (id_tok);
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1286 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1287 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1288 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1289
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1290 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1291 // Metaclass query
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1292 %}
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1293
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1294 \?{FQIDENT} {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1295 curr_lexer->lexer_debug ("\\?{FQIDENT}");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1296
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1297 if (curr_lexer->previous_token_may_be_command ()
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1298 && curr_lexer->space_follows_previous_token ())
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1299 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1300 yyless (0);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1301 curr_lexer->push_start_state (COMMAND_START);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1302 }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1303 else
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1304 {
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1305 int id_tok = curr_lexer->handle_meta_identifier ();
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1306
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1307 if (id_tok >= 0)
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 curr_lexer->looking_for_object_index = true;
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1310
16683 e1c6ad54259f maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16645 16681 diff changeset	1311 return curr_lexer->count_token_internal (id_tok);
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1312 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1313 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1314 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1315
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	1316 "@" {
18492 e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1317 curr_lexer->lexer_debug ("@");
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1318
16334 06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1319 if (curr_lexer->previous_token_may_be_command ()
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1320 && curr_lexer->space_follows_previous_token ())
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1321 {
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1322 yyless (0);
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1323 curr_lexer->push_start_state (COMMAND_START);
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1324 }
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1325 else
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1326 {
18492 e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1327 int tok = curr_lexer->previous_token_value ();
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1328
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1329 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	1330 && curr_lexer->space_follows_previous_token ()
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1331 && ! (tok == '[' \|\| tok == '{'
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1332 \|\| 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	1333 {
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1334 yyless (0);
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1335 unput (',');
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1336 }
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1337 else
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1338 {
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->current_input_column++;
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 curr_lexer->looking_at_function_handle++;
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1342 curr_lexer->looking_for_object_index = false;
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1343 curr_lexer->at_beginning_of_statement = false;
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1344
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1345 return curr_lexer->count_token ('@');
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1346 }
16334 06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1347 }
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	1348 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	1349
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	1350 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1351 // 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	1352 // 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	1353 // 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	1354 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1355
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1356 {NL} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1357 curr_lexer->lexer_debug ("{NL}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1358
16309 e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1359 if (curr_lexer->nesting_level.is_paren ())
e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1360 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1361 curr_lexer->input_line_number++;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1362 curr_lexer->current_input_column = 1;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1363
16309 e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1364 curr_lexer->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	1365 curr_lexer->warn_language_extension
16309 e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1366 ("bare newline inside parentheses");
e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1367 }
e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1368 else if (curr_lexer->nesting_level.none ()
e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1369 \|\| curr_lexer->nesting_level.is_anon_fcn_body ())
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	1370 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1371 curr_lexer->input_line_number++;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1372 curr_lexer->current_input_column = 1;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1373
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1374 curr_lexer->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	1375
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1376 return curr_lexer->count_token ('\n');
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	1377 }
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1378 else if (curr_lexer->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	1379 {
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1380 token *tok = new token (LEXICAL_ERROR,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1381 "unexpected internal lexer error",
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1382 curr_lexer->input_line_number,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1383 curr_lexer->current_input_column);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1384
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1385 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1386
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1387 curr_lexer->input_line_number++;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1388 curr_lexer->current_input_column = 1;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1389
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1390 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	1391 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1392 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1393
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1394 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1395 // 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	1396 // operator.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1397 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1398
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1399 "'" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1400 curr_lexer->lexer_debug ("'");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1401
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1402 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	1403 && curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1404 {
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1405 curr_lexer->current_input_column++;
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1406 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	1407 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	1408 }
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16680 diff changeset	1409 else if (curr_lexer->at_beginning_of_statement)
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16680 diff changeset	1410 {
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16680 diff changeset	1411 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1412 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	1413 }
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1414 else
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1415 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1416 int tok = curr_lexer->previous_token_value ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1417
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1418 if (curr_lexer->whitespace_is_significant ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1419 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1420 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	1421 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1422 if (tok == '[' \|\| tok == '{'
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1423 \|\| curr_lexer->previous_token_is_binop ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1424 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1425 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1426 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	1427 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1428 else
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1429 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1430 yyless (0);
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1431 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	1432 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1433 curr_lexer->current_input_column--;
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1434 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1435 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1436 else
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1437 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1438 if (tok == '[' \|\| tok == '{'
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1439 \|\| curr_lexer->previous_token_is_binop ()
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1440 \|\| curr_lexer->previous_token_is_keyword ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1441 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1442 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1443 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	1444 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1445 else
16284 09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. John W. Eaton <jwe@octave.org> parents: 16283 diff changeset	1446 return curr_lexer->count_token (HERMITIAN);
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1447 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1448 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1449 else
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1450 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1451 if (! tok \|\| tok == '[' \|\| tok == '{' \|\| tok == '('
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1452 \|\| curr_lexer->previous_token_is_binop ()
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1453 \|\| curr_lexer->previous_token_is_keyword ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1454 {
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1455 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1456 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	1457 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1458 else
16284 09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. John W. Eaton <jwe@octave.org> parents: 16283 diff changeset	1459 return curr_lexer->count_token (HERMITIAN);
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1460 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1461 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1462 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1463
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1464 %{
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1465 // Double quotes always begin strings.
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1466 %}
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1467
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	1468 \" {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1469 curr_lexer->lexer_debug ("\\\"");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1470
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1471 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	1472 && curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1473 {
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1474 curr_lexer->current_input_column++;
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1475 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	1476 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	1477 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1478 else
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1479 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1480 int tok = curr_lexer->previous_token_value ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1481
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1482 if (curr_lexer->whitespace_is_significant ())
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1483 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1484 if (curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1485 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1486 if (tok == '[' \|\| tok == '{'
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1487 \|\| curr_lexer->previous_token_is_binop ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1488 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1489 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1490 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	1491 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1492 else
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1493 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1494 yyless (0);
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1495 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	1496 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1497 curr_lexer->current_input_column--;
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1498 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1499 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1500 else
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1501 {
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1502 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1503 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	1504 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1505 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1506 else
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1507 {
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1508 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1509 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	1510 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1511 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1512 }
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1513
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1514 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1515 // Other operators.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1516 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1517
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1518 ":" { CMD_OR_OP (":", ':', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1519 ".+" { CMD_OR_OP (".+", EPLUS, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1520 ".-" { CMD_OR_OP (".-", EMINUS, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1521 "." { CMD_OR_OP (".", EMUL, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1522 "./" { CMD_OR_OP ("./", EDIV, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1523 ".\\" { CMD_OR_OP (".\\", ELEFTDIV, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1524 ".^" { CMD_OR_OP (".^", EPOW, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1525 "." { CMD_OR_OP (".", EPOW, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1526 "<=" { CMD_OR_OP ("<=", EXPR_LE, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1527 "==" { CMD_OR_OP ("==", EXPR_EQ, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1528 "~=" { CMD_OR_OP ("~=", EXPR_NE, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1529 "!=" { CMD_OR_OP ("!=", EXPR_NE, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1530 ">=" { CMD_OR_OP (">=", EXPR_GE, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1531 "&" { CMD_OR_OP ("&", EXPR_AND, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1532 "\|" { CMD_OR_OP ("\|", EXPR_OR, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1533 "<" { CMD_OR_OP ("<", EXPR_LT, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1534 ">" { CMD_OR_OP (">", EXPR_GT, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1535 "" { CMD_OR_OP ("", '*', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1536 "/" { CMD_OR_OP ("/", '/', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1537
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 // In Matlab, '\' may also trigger command syntax.
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1540 %}
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1541
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1542 "\\" { return curr_lexer->handle_op ("\\", LEFTDIV); }
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 "^" { CMD_OR_OP ("^", POW, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1545 "" { CMD_OR_OP ("", POW, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1546 "&&" { CMD_OR_OP ("&&", EXPR_AND_AND, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1547 "\|\|" { 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	1548
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1549 ";" {
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1550 bool at_beginning_of_statement
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1551 = (! (curr_lexer->whitespace_is_significant ()
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1552 \|\| curr_lexer->looking_at_object_index.front ()));
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1553
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1554 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	1555 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1556
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1557 "+" { CMD_OR_UNARY_OP ("+", '+', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1558 "-" { CMD_OR_UNARY_OP ("-", '-', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1559
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1560 "~" { CMD_OR_UNARY_OP ("~", EXPR_NOT, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1561 "!" { 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	1562
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1563 "," {
16265 71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1564 bool at_beginning_of_statement
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1565 = (! (curr_lexer->whitespace_is_significant ()
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1566 \|\| curr_lexer->looking_at_object_index.front ()));
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1567
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1568 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	1569 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1570
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1571 ".'" {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1572 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	1573 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1574
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1575 "++" { CMD_OR_UNARY_OP ("++", PLUS_PLUS, false); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1576 "--" { CMD_OR_UNARY_OP ("--", MINUS_MINUS, false); }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1577
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1578 "(" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1579 curr_lexer->lexer_debug ("(");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1580
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1581 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1582
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1583 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1584 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1585 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1586 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1587
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1588 if (! (tok == '[' \|\| tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1589 \|\| curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1590 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1591 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1592
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1593 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1594 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1595 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1596 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	1597 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1598 curr_lexer->current_input_column--;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1599 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1600 else
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1601 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1602 // If we are looking for an object index, then push TRUE for
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1603 // looking_at_object_index. Otherwise, just push whatever state
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1604 // 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	1605 // the matching close paren).
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1606
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1607 curr_lexer->looking_at_object_index.push_front
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1608 (curr_lexer->looking_for_object_index);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1609
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1610 curr_lexer->looking_at_indirect_ref = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1611 curr_lexer->looking_for_object_index = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1612 curr_lexer->at_beginning_of_statement = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1613
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1614 curr_lexer->nesting_level.paren ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1615 curr_lexer->decrement_promptflag ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1616
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1617 return curr_lexer->handle_token ('(');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1618 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1619 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1620
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1621 ")" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1622 curr_lexer->lexer_debug (")");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1623
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1624 curr_lexer->nesting_level.remove ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1625 curr_lexer->current_input_column++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1626
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1627 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1628
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1629 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1630 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1631
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1632 if (curr_lexer->looking_at_anon_fcn_args)
16265 71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1633 {
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1634 curr_lexer->looking_at_anon_fcn_args = false;
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1635 curr_lexer->nesting_level.anon_fcn_body ();
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1636 }
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 12801 diff changeset	1637
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1638 return curr_lexer->count_token (')');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1639 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1640
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1641 "." {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1642 curr_lexer->lexer_debug (".");
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1643
16325 fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1644 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	1645 && curr_lexer->space_follows_previous_token ())
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1646 {
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1647 yyless (0);
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1648 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	1649 }
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1650 else
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1651 {
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1652 curr_lexer->looking_for_object_index = false;
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1653 curr_lexer->at_beginning_of_statement = false;
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1654
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1655 return curr_lexer->handle_token ('.');
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1656 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1657 }
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1658
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1659 %{
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1660 // = and op= operators.
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1661 %}
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1662
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1663 "=" {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1664 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	1665
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1666 return curr_lexer->handle_op ("=", '=');
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1667 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1668
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1669 "+=" { CMD_OR_COMPUTED_ASSIGN_OP ("+=", ADD_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1670 "-=" { CMD_OR_COMPUTED_ASSIGN_OP ("-=", SUB_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1671 "=" { CMD_OR_COMPUTED_ASSIGN_OP ("=", MUL_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1672 "/=" { CMD_OR_COMPUTED_ASSIGN_OP ("/=", DIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1673 "\\=" { CMD_OR_COMPUTED_ASSIGN_OP ("\\=", LEFTDIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1674 ".+=" { CMD_OR_COMPUTED_ASSIGN_OP (".+=", ADD_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1675 ".-=" { CMD_OR_COMPUTED_ASSIGN_OP (".-=", SUB_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1676 ".=" { CMD_OR_COMPUTED_ASSIGN_OP (".=", EMUL_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1677 "./=" { CMD_OR_COMPUTED_ASSIGN_OP ("./=", EDIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1678 ".\\=" { CMD_OR_COMPUTED_ASSIGN_OP (".\\=", ELEFTDIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1679 "^=" { CMD_OR_COMPUTED_ASSIGN_OP ("^=", POW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1680 "**=" { CMD_OR_COMPUTED_ASSIGN_OP ("^=", POW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1681 ".^=" { CMD_OR_COMPUTED_ASSIGN_OP (".^=", EPOW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1682 ".**=" { CMD_OR_COMPUTED_ASSIGN_OP (".^=", EPOW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1683 "&=" { CMD_OR_COMPUTED_ASSIGN_OP ("&=", AND_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1684 "\|=" { 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	1685
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1686 %{
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1687 // In Matlab, '{' may also trigger command syntax.
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1688 %}
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1689
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1690 "{" {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1691 curr_lexer->lexer_debug ("{");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1692
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1693 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1694
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1695 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1696 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1697 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1698 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1699
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1700 if (! (tok == '[' \|\| tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1701 \|\| curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1702 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1703 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1704
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1705 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1706 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1707 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1708 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	1709 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1710 curr_lexer->current_input_column--;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1711 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1712 else
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1713 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1714 curr_lexer->nesting_level.brace ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1715
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1716 curr_lexer->looking_at_object_index.push_front
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1717 (curr_lexer->looking_for_object_index);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1718
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1719 curr_lexer->current_input_column += yyleng;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1720 curr_lexer->looking_for_object_index = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1721 curr_lexer->at_beginning_of_statement = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1722
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1723 curr_lexer->decrement_promptflag ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1724
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1725 curr_lexer->braceflag++;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1726
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1727 curr_lexer->push_start_state (MATRIX_START);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1728
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1729 return curr_lexer->count_token ('{');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1730 }
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1731 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1732
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1733 "}" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1734 curr_lexer->lexer_debug ("}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1735
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1736 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1737
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1738 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1739 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1740
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1741 curr_lexer->nesting_level.remove ();
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1742
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1743 return curr_lexer->handle_token ('}');
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1744 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1745
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1746 %{
2066 a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe] jwe parents: 2042 diff changeset	1747 // Unrecognized input is a lexical error.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1748 %}
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1749
2042 31f4f775b8c6 [project @ 1996-03-28 09:06:28 by jwe] jwe parents: 1994 diff changeset	1750 . {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1751 curr_lexer->lexer_debug (".");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1752
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1753 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	1754
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1755 int c = curr_lexer->text_yyinput ();
4248 eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe] jwe parents: 4241 diff changeset	1756
16294 0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1757 if (c == 1)
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1758 return -1;
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1759 else if (c == EOF)
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1760 return curr_lexer->handle_end_of_input ();
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1761 else
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	1762 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1763 std::ostringstream buf;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1764
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1765 buf << "invalid character '"
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1766 << undo_string_escape (static_cast<char> (c))
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1767 << "' (ASCII " << c << ")";
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1768
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1769 token *tok = new token (LEXICAL_ERROR, buf.str (),
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1770 curr_lexer->input_line_number,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1771 curr_lexer->current_input_column);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1772
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1773 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1774
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1775 curr_lexer->current_input_column++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1776
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1777 return curr_lexer->count_token_internal (LEXICAL_ERROR);
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	1778 }
2066 a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe] jwe parents: 2042 diff changeset	1779 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1780
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1781 %{
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1782 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1783 // Disable this warning for code that is generated by flex.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1784 #pragma GCC diagnostic push
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1785 #pragma GCC diagnostic ignored "-Wold-style-cast"
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1786 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1787 %}
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1788
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1789 %{
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1790 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1791 // Also disable this warning for functions that is generated by flex
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1792 // after the pattern rules.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1793 #pragma GCC diagnostic ignored "-Wunused-parameter"
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1794 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1795 %}
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1796
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1797 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1798
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1799 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1800 // Restore prevailing warning state for remainder of the file.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1801 #pragma GCC diagnostic pop
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1802 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1803
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1804 void *
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1805 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	1806 {
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1807 return malloc (size);
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1808 }
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1809
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1810 void *
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1811 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	1812 {
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1813 return realloc (ptr, size);
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1814 }
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1815
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1816 void
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1817 octave_free (void *ptr, yyscan_t)
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1818 {
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1819 free (ptr);
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1820 }
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1821
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1822 static void
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1823 display_character (char c)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1824 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1825 if (isgraph (c))
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1826 std::cerr << c;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1827 else
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1828 switch (c)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1829 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1830 case 0:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1831 std::cerr << "NUL";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1832 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1833
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1834 case 1:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1835 std::cerr << "SOH";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1836 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1837
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1838 case 2:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1839 std::cerr << "STX";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1840 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1841
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1842 case 3:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1843 std::cerr << "ETX";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1844 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1845
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1846 case 4:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1847 std::cerr << "EOT";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1848 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1849
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1850 case 5:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1851 std::cerr << "ENQ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1852 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1853
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1854 case 6:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1855 std::cerr << "ACK";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1856 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1857
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1858 case 7:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1859 std::cerr << "\\a";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1860 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1861
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1862 case 8:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1863 std::cerr << "\\b";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1864 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1865
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1866 case 9:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1867 std::cerr << "\\t";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1868 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1869
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1870 case 10:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1871 std::cerr << "\\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1872 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1873
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1874 case 11:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1875 std::cerr << "\\v";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1876 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1877
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1878 case 12:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1879 std::cerr << "\\f";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1880 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1881
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1882 case 13:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1883 std::cerr << "\\r";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1884 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1885
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1886 case 14:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1887 std::cerr << "SO";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1888 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1889
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1890 case 15:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1891 std::cerr << "SI";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1892 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1893
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1894 case 16:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1895 std::cerr << "DLE";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1896 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1897
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1898 case 17:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1899 std::cerr << "DC1";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1900 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1901
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1902 case 18:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1903 std::cerr << "DC2";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1904 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1905
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1906 case 19:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1907 std::cerr << "DC3";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1908 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1909
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1910 case 20:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1911 std::cerr << "DC4";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1912 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1913
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1914 case 21:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1915 std::cerr << "NAK";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1916 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1917
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1918 case 22:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1919 std::cerr << "SYN";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1920 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1921
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1922 case 23:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1923 std::cerr << "ETB";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1924 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1925
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1926 case 24:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1927 std::cerr << "CAN";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1928 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1929
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1930 case 25:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1931 std::cerr << "EM";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1932 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1933
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1934 case 26:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1935 std::cerr << "SUB";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1936 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1937
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1938 case 27:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1939 std::cerr << "ESC";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1940 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1941
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1942 case 28:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1943 std::cerr << "FS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1944 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1945
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1946 case 29:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1947 std::cerr << "GS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1948 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1949
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1950 case 30:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1951 std::cerr << "RS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1952 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1953
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1954 case 31:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1955 std::cerr << "US";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1956 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1957
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1958 case 32:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1959 std::cerr << "SPACE";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1960 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1961
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1962 case 127:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1963 std::cerr << "DEL";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1964 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1965 }
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1966 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1967
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1968 bool
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1969 is_keyword (const std::string& s)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1970 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1971 // Parsing function names like "set.property_name" inside
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1972 // classdef-style class definitions is simplified by handling the
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1973 // "set" and "get" portions of the names using the same mechanism as
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1974 // is used for keywords. However, they are not really keywords in
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1975 // the language, so omit them from the list of possible keywords.
21369 105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21332 diff changeset	1976 // Likewise for "enumeration", "events", "methods", and
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21332 diff changeset	1977 // "properties".
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1978
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1979 return (octave_kw_hash::in_word_set (s.c_str (), s.length ()) != 0
21369 105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21332 diff changeset	1980 && ! (s == "set" \|\| s == "get"
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21332 diff changeset	1981 \|\| s == "enumeration" \|\| s == "events"
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21332 diff changeset	1982 \|\| s == "methods" \|\| s == "properties"));
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1983 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1984
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1985 DEFUN (iskeyword, args, ,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1986 "-- texinfo --\n\
20895 7697a3433e37 doc: Remove class of function from docstring from generated C++ files. Rik <rik@octave.org> parents: 20835 diff changeset	1987 @deftypefn {} {} iskeyword ()\n\
7697a3433e37 doc: Remove class of function from docstring from generated C++ files. Rik <rik@octave.org> parents: 20835 diff changeset	1988 @deftypefnx {} {} iskeyword (@var{name})\n\
20163 075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19859 diff changeset	1989 Return true if @var{name} is an Octave keyword.\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19859 diff changeset	1990 \n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19859 diff changeset	1991 If @var{name} is omitted, return a list of keywords.\n\
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1992 @seealso{isvarname, exist}\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1993 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1994 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1995 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1996
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1997 int nargin = args.length ();
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1998
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1999 if (nargin > 1)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20773 diff changeset	2000 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20773 diff changeset	2001
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2002 if (nargin == 0)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2003 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2004 // Neither set nor get are keywords. See the note in the
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2005 // is_keyword function for additional details.
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2006
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2007 string_vector lst (TOTAL_KEYWORDS);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2008
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2009 int j = 0;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2010
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2011 for (int i = 0; i < TOTAL_KEYWORDS; i++)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2012 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2013 std::string kword = wordlist[i].name;
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2014
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2015 if (kword != "set" && kword != "get")
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2016 lst[j++] = kword;
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2017 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2018
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2019 lst.resize (j);
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 retval = Cell (lst.sort ());
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2022 }
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2023 else
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2024 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2025 std::string name = args(0).xstring_value ("iskeyword: NAME must be a string");
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2026 retval = is_keyword (name);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2027 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2028
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2029 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2030 }
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 /*
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2033
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2034 %!assert (iskeyword ("for"))
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2035 %!assert (iskeyword ("fort"), false)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2036 %!assert (iskeyword ("fft"), false)
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2037 %!assert (iskeyword ("get"), false)
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2038 %!assert (iskeyword ("set"), false)
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2039
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2040 %!error iskeyword ("A", "B")
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2041 %!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	2042
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
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2045 DEFUN (__display_tokens__, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2046 "-- texinfo --\n\
20895 7697a3433e37 doc: Remove class of function from docstring from generated C++ files. Rik <rik@octave.org> parents: 20835 diff changeset	2047 @deftypefn {} {} __display_tokens__ ()\n\
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2048 Query or set the internal variable that determines whether Octave's\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2049 lexer displays tokens as they are read.\n\
18531 04b4fb217b1a doc: Improve documentation strings in parse-tree directory. Rik <rik@octave.org> parents: 18492 diff changeset	2050 @seealso{__lexer_debug_flag__, __token_count__}\n\
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2051 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2052 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2053 return SET_INTERNAL_VARIABLE (display_tokens);
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 DEFUN (__token_count__, , ,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2057 "-- texinfo --\n\
20895 7697a3433e37 doc: Remove class of function from docstring from generated C++ files. Rik <rik@octave.org> parents: 20835 diff changeset	2058 @deftypefn {} {} __token_count__ ()\n\
18531 04b4fb217b1a doc: Improve documentation strings in parse-tree directory. Rik <rik@octave.org> parents: 18492 diff changeset	2059 Return the number of language tokens processed since Octave startup.\n\
04b4fb217b1a doc: Improve documentation strings in parse-tree directory. Rik <rik@octave.org> parents: 18492 diff changeset	2060 @seealso{__lexer_debug_flag__, __display_tokens__}\n\
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2061 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2062 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2063 return octave_value (Vtoken_count);
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 DEFUN (__lexer_debug_flag__, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2067 "-- texinfo --\n\
20895 7697a3433e37 doc: Remove class of function from docstring from generated C++ files. Rik <rik@octave.org> parents: 20835 diff changeset	2068 @deftypefn {} {@var{val} =} __lexer_debug_flag__ ()\n\
7697a3433e37 doc: Remove class of function from docstring from generated C++ files. Rik <rik@octave.org> parents: 20835 diff changeset	2069 @deftypefnx {} {@var{old_val} =} __lexer_debug_flag__ (@var{new_val})\n\
18531 04b4fb217b1a doc: Improve documentation strings in parse-tree directory. Rik <rik@octave.org> parents: 18492 diff changeset	2070 Query or set the internal flag that determines whether Octave's lexer prints\n\
04b4fb217b1a doc: Improve documentation strings in parse-tree directory. Rik <rik@octave.org> parents: 18492 diff changeset	2071 debug information as it processes an expression.\n\
04b4fb217b1a doc: Improve documentation strings in parse-tree directory. Rik <rik@octave.org> parents: 18492 diff changeset	2072 @seealso{__display_tokens__, __token_count__, __parse_debug_flag__}\n\
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2073 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2074 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2075 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2076
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2077 retval = set_internal_variable (lexer_debug_flag, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2078 "__lexer_debug_flag__");
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 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2081 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2082
16193 d7392bf42fd1 use inheritance to simplify initialization in octave_lexer constructor John W. Eaton <jwe@octave.org> parents: 16183 diff changeset	2083 lexical_feedback::~lexical_feedback (void)
d7392bf42fd1 use inheritance to simplify initialization in octave_lexer constructor John W. Eaton <jwe@octave.org> parents: 16183 diff changeset	2084 {
16230 4bf907906134 use a queue to hold tokens in the lexer John W. Eaton <jwe@octave.org> parents: 16229 diff changeset	2085 tokens.clear ();
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2086 }
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2087
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2088 void
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2089 lexical_feedback::init (void)
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2090 {
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2091 // The closest paren, brace, or bracket nesting is not an object
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2092 // index.
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2093 looking_at_object_index.push_front (false);
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2094 }
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2095
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2096 void
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2097 lexical_feedback::reset (void)
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2098 {
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2099 end_of_input = false;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2100 at_beginning_of_statement = true;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2101 looking_at_anon_fcn_args = false;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2102 looking_at_return_list = false;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2103 looking_at_parameter_list = false;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2104 looking_at_decl_list = false;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2105 looking_at_initializer_expression = false;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2106 looking_at_matrix_or_assign_lhs = false;
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	2107 looking_for_object_index = false;
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2108 looking_at_indirect_ref = false;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2109 parsing_class_method = false;
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	2110 parsing_classdef = false;
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2111 maybe_classdef_get_set_method = false;
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	2112 parsing_classdef_get_method = false;
3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	2113 parsing_classdef_set_method = false;
20772 51ab9145f6e6 set all lexical_feedback variables in init function (bug #46522) John W. Eaton <jwe@octave.org> parents: 20188 diff changeset	2114 quote_is_transpose = false;
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2115 force_script = false;
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	2116 reading_fcn_file = false;
810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	2117 reading_script_file = false;
810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	2118 reading_classdef_file = false;
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2119 input_line_number = 1;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2120 current_input_column = 1;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2121 bracketflag = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2122 braceflag = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2123 looping = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2124 defining_func = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2125 looking_at_function_handle = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2126 block_comment_nesting_level = 0;
20772 51ab9145f6e6 set all lexical_feedback variables in init function (bug #46522) John W. Eaton <jwe@octave.org> parents: 20188 diff changeset	2127 command_arg_paren_count = 0;
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2128 token_count = 0;
16207 0467d68ca891 move current_input_line to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	2129 current_input_line = "";
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2130 comment_text = "";
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2131 help_text = "";
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2132 string_text = "";
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2133 string_line = 0;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2134 string_column = 0;
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2135 fcn_file_name = "";
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2136 fcn_file_full_name = "";
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2137 looking_at_object_index.clear ();
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2138 looking_at_object_index.push_front (false);
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2139
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2140 while (! parsed_function_name.empty ())
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2141 parsed_function_name.pop ();
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2142
20772 51ab9145f6e6 set all lexical_feedback variables in init function (bug #46522) John W. Eaton <jwe@octave.org> parents: 20188 diff changeset	2143 pending_local_variables.clear ();
51ab9145f6e6 set all lexical_feedback variables in init function (bug #46522) John W. Eaton <jwe@octave.org> parents: 20188 diff changeset	2144 symtab_context.clear ();
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2145 nesting_level.reset ();
16230 4bf907906134 use a queue to hold tokens in the lexer John W. Eaton <jwe@octave.org> parents: 16229 diff changeset	2146 tokens.clear ();
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2147 }
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2148
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2149 int
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2150 lexical_feedback::previous_token_value (void) const
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2151 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2152 const token *tok = tokens.front ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2153 return tok ? tok->token_value () : 0;
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2154 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2155
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2156 bool
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2157 lexical_feedback::previous_token_value_is (int tok_val) const
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2158 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2159 const token *tok = tokens.front ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2160 return tok ? tok->token_value_is (tok_val) : false;
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2161 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2162
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2163 void
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2164 lexical_feedback::mark_previous_token_trailing_space (void)
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2165 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2166 token *tok = tokens.front ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2167 if (tok && ! previous_token_value_is ('\n'))
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2168 tok->mark_trailing_space ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2169 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2170
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2171 bool
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2172 lexical_feedback::space_follows_previous_token (void) const
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2173 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2174 const token *tok = tokens.front ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2175 return tok ? tok->space_follows_token () : false;
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2176 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2177
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2178 bool
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2179 lexical_feedback::previous_token_is_binop (void) const
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2180 {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2181 int tok = previous_token_value ();
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2182
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2183 return (tok == '+' \|\| tok == '-' \|\| tok == '@'
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2184 \|\| tok == ',' \|\| tok == ';' \|\| tok == '*' \|\| tok == '/'
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2185 \|\| tok == ':' \|\| tok == '=' \|\| tok == ADD_EQ
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2186 \|\| tok == AND_EQ \|\| tok == DIV_EQ \|\| tok == EDIV
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2187 \|\| tok == EDIV_EQ \|\| tok == ELEFTDIV \|\| tok == ELEFTDIV_EQ
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2188 \|\| tok == EMINUS \|\| tok == EMUL \|\| tok == EMUL_EQ
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2189 \|\| tok == EPOW \|\| tok == EPOW_EQ \|\| tok == EXPR_AND
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2190 \|\| tok == EXPR_AND_AND \|\| tok == EXPR_EQ \|\| tok == EXPR_GE
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2191 \|\| tok == EXPR_GT \|\| tok == EXPR_LE \|\| tok == EXPR_LT
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2192 \|\| tok == EXPR_NE \|\| tok == EXPR_NOT \|\| tok == EXPR_OR
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2193 \|\| tok == EXPR_OR_OR \|\| tok == LEFTDIV \|\| tok == LEFTDIV_EQ
21294 3d375b0905a0 eliminate unused << and >> operators from Octave scripting language John W. Eaton <jwe@octave.org> parents: 21102 diff changeset	2194 \|\| tok == MUL_EQ \|\| tok == OR_EQ \|\| tok == POW
3d375b0905a0 eliminate unused << and >> operators from Octave scripting language John W. Eaton <jwe@octave.org> parents: 21102 diff changeset	2195 \|\| tok == POW_EQ \|\| tok == SUB_EQ);
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2196 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2197
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2198 bool
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2199 lexical_feedback::previous_token_is_keyword (void) const
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2200 {
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2201 const token *tok = tokens.front ();
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2202 return tok ? tok->is_keyword () : false;
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2203 }
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2204
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2205 bool
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2206 lexical_feedback::previous_token_may_be_command (void) const
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2207 {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2208 const token *tok = tokens.front ();
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2209 return tok ? tok->may_be_command () : false;
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2210 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2211
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2212 void
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2213 lexical_feedback::maybe_mark_previous_token_as_variable (void)
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2214 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2215 token *tok = tokens.front ();
16756 d56cbc17566e avoid looking at previous token that doesn't exist (bug #39180) John W. Eaton <jwe@octave.org> parents: 16681 diff changeset	2216
d56cbc17566e avoid looking at previous token that doesn't exist (bug #39180) John W. Eaton <jwe@octave.org> parents: 16681 diff changeset	2217 if (tok && tok->is_symbol ())
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2218 pending_local_variables.insert (tok->symbol_name ());
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2219 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2220
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2221 void
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2222 lexical_feedback::mark_as_variables (const std::list<std::string>& lst)
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2223 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2224 for (std::list<std::string>::const_iterator p = lst.begin ();
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2225 p != lst.end (); p++)
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2226 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2227 pending_local_variables.insert (*p);
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2228 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2229 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2230
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2231 static bool
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2232 looks_like_copyright (const std::string& s)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2233 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2234 bool retval = false;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2235
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2236 if (! s.empty ())
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2237 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2238 size_t offset = s.find_first_not_of (" \t");
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2239
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2240 retval = (s.substr (offset, 9) == "Copyright" \|\| s.substr (offset, 6) == "Author");
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2241 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2242
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2243 return retval;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2244 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2245
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2246 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2247 octave_base_lexer::input_buffer::fill (const std::string& input, bool eof_arg)
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2248 {
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	2249 buffer = input;
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2250 chars_left = buffer.length ();
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2251 pos = buffer.c_str ();
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	2252 eof = eof_arg;
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2253 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2254
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2255 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2256 octave_base_lexer::input_buffer::copy_chunk (char *buf, size_t max_size)
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2257 {
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2258 static const char * const eol = "\n";
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2259
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2260 size_t len = max_size > chars_left ? chars_left : max_size;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2261 assert (len > 0);
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2262
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2263 memcpy (buf, pos, len);
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2264
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2265 chars_left -= len;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2266 pos += len;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2267
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2268 // Make sure input ends with a new line character.
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2269 if (chars_left == 0 && buf[len-1] != '\n')
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2270 {
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2271 if (len < max_size)
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2272 {
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2273 // There is enough room to plug the newline character in
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2274 // the buffer.
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2275 buf[len++] = '\n';
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2276 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2277 else
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2278 {
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2279 // There isn't enough room to plug the newline character
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2280 // in the buffer so arrange to have it returned on the next
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2281 // call to octave_base_lexer::read.
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2282 pos = eol;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2283 chars_left = 1;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2284 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2285 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2286
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2287 return len;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2288 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2289
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2290 octave_base_lexer::~octave_base_lexer (void)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2291 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2292 yylex_destroy (scanner);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2293 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2294
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2295 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2296 octave_base_lexer::init (void)
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2297 {
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2298 yylex_init (&scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2299
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2300 // Make octave_base_lexer object available through yyextra in
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2301 // flex-generated lexer.
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2302 yyset_extra (this, scanner);
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2303
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2304 clear_start_state ();
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2305 }
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2306
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2307 // Inside Flex-generated functions, yyg is the scanner cast to its real
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2308 // type. Some flex macros that we use in octave_base_lexer member functions
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2309 // (for example, BEGIN) use yyg. If we could perform the actions of
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2310 // these macros with functions instead, we could eliminate the
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2311 // OCTAVE_YYG macro.
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2312
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2313 #define OCTAVE_YYG \
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2314 struct yyguts_t yyg = static_cast<struct yyguts_t> (scanner)
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2315
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2316 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2317 octave_base_lexer::reset (void)
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2318 {
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2319 // Start off on the right foot.
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2320 clear_start_state ();
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2321
16320 09f0cb9cac7d don't modify symbol table scope in the parser John W. Eaton <jwe@octave.org> parents: 16309 diff changeset	2322 symtab_context.clear ();
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2323
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2324 // We do want a prompt by default.
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	2325 promptflag (1);
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2326
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2327 // Only ask for input from stdin if we are expecting interactive
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2328 // input.
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2329
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2330 if (! quitting_gracefully
19849 1c9ed5b4c73d input.h: change meaning of interactive and forced_interactive global variables. Carnë Draug <carandraug@octave.org> parents: 19784 diff changeset	2331 && interactive
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2332 && ! (reading_fcn_file
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2333 \|\| reading_classdef_file
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2334 \|\| reading_script_file
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2335 \|\| input_from_eval_string ()))
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2336 yyrestart (stdin, scanner);
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2337
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2338 lexical_feedback::reset ();
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17355 diff changeset	2339
efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17355 diff changeset	2340 comment_buf.reset ();
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2341 }
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2342
16124 3be725cd195b move more lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16123 diff changeset	2343 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2344 octave_base_lexer::prep_for_file (void)
16124 3be725cd195b move more lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16123 diff changeset	2345 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2346 reading_script_file = true;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2347
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2348 push_start_state (INPUT_FILE_START);
16124 3be725cd195b move more lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16123 diff changeset	2349 }
3be725cd195b move more lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16123 diff changeset	2350
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2351 void
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2352 octave_base_lexer::begin_string (int state)
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2353 {
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2354 string_line = input_line_number;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2355 string_column = current_input_column;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2356
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2357 push_start_state (state);
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2358 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2359
16121 bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	2360 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2361 octave_base_lexer::handle_end_of_input (void)
16164 c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2362 {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	2363 lexer_debug ("<<EOF>>");
16164 c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2364
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2365 if (block_comment_nesting_level != 0)
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2366 {
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2367 warning ("block comment open at end of input");
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2368
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2369 if ((reading_fcn_file \|\| reading_script_file \|\| reading_classdef_file)
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2370 && ! fcn_file_name.empty ())
16164 c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2371 warning ("near line %d of file '%s.m'",
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2372 input_line_number, fcn_file_name.c_str ());
16164 c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2373 }
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2374
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	2375 return handle_token (END_OF_INPUT);
16164 c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2376 }
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2377
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2378 char *
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2379 octave_base_lexer::flex_yytext (void)
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2380 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2381 return yyget_text (scanner);
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2382 }
210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2383
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2384 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2385 octave_base_lexer::flex_yyleng (void)
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2386 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2387 return yyget_leng (scanner);
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2388 }
421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2389
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2390 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2391 octave_base_lexer::text_yyinput (void)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2392 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2393 int c = yyinput (scanner);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2394
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2395 if (lexer_debug_flag)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2396 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2397 std::cerr << "I: ";
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2398 display_character (c);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2399 std::cerr << std::endl;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2400 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2401
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2402 // Convert CRLF into just LF and single CR into LF.
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2403
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2404 if (c == '\r')
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2405 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2406 c = yyinput (scanner);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2407
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2408 if (lexer_debug_flag)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2409 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2410 std::cerr << "I: ";
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2411 display_character (c);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2412 std::cerr << std::endl;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2413 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2414
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2415 if (c != '\n')
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2416 {
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2417 xunput (c);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2418 c = '\n';
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2419 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2420 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2421
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2422 return c;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2423 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2424
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2425 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2426 octave_base_lexer::xunput (char c, char *buf)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2427 {
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	2428 if (c != EOF)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2429 {
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	2430 if (lexer_debug_flag)
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2431 {
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2432 std::cerr << "U: ";
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2433 display_character (c);
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2434 std::cerr << std::endl;
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2435 }
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2436
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2437 yyunput (c, buf, scanner);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2438 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2439 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2440
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2441 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2442 octave_base_lexer::xunput (char c)
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2443 {
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2444 char *yytxt = flex_yytext ();
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2445
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2446 xunput (c, yytxt);
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2447 }
96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2448
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2449 bool
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2450 octave_base_lexer::looking_at_space (void)
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2451 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2452 int c = text_yyinput ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2453 xunput (c);
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2454 return (c == ' ' \|\| c == '\t');
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2455 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2456
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2457 bool
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2458 octave_base_lexer::inside_any_object_index (void)
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2459 {
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2460 bool retval = false;
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2461
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2462 for (std::list<bool>::const_iterator i = looking_at_object_index.begin ();
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2463 i != looking_at_object_index.end (); i++)
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2464 {
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2465 if (*i)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2466 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2467 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2468 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2469 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2470 }
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2471
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2472 return retval;
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2473 }
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2474
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2475 bool
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2476 octave_base_lexer::is_variable (const std::string& name)
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2477 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2478 return (symbol_table::is_variable (name)
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2479 \|\| (pending_local_variables.find (name)
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2480 != pending_local_variables.end ()));
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2481 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2482
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	2483 // Handle keywords. Return -1 if the keyword should be ignored.
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	2484
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2485 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2486 octave_base_lexer::is_keyword_token (const std::string& s)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2487 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2488 int l = input_line_number;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2489 int c = current_input_column;
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: 3802 diff changeset	2490
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	2491 int len = s.length ();
922 708827b941b4 [project @ 1994-11-14 22:14:13 by jwe] jwe parents: 916 diff changeset	2492
5088 7830f271a53f [project @ 2004-12-01 19:54:45 by jwe] jwe parents: 5035 diff changeset	2493 const octave_kw *kw = octave_kw_hash::in_word_set (s.c_str (), len);
191 b6b4d8c513fe [project @ 1993-10-29 23:41:39 by jwe] jwe parents: 186 diff changeset	2494
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2495 if (kw)
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 120 diff changeset	2496 {
18319 f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2497 bool previous_at_bos = at_beginning_of_statement;
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2498
16783 0bf1d559b321 always set at_beginning_of_statement when recognizing keywords (bug #38758) John W. Eaton <jwe@octave.org> parents: 16756 diff changeset	2499 // May be reset to true for some token types.
0bf1d559b321 always set at_beginning_of_statement when recognizing keywords (bug #38758) John W. Eaton <jwe@octave.org> parents: 16756 diff changeset	2500 at_beginning_of_statement = false;
0bf1d559b321 always set at_beginning_of_statement when recognizing keywords (bug #38758) John W. Eaton <jwe@octave.org> parents: 16756 diff changeset	2501
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	2502 token *tok_val = 0;
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2503
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2504 switch (kw->kw_id)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2505 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2506 case break_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2507 case catch_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2508 case continue_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2509 case else_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2510 case otherwise_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2511 case return_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2512 case unwind_protect_cleanup_kw:
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2513 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2514 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2515
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	2516 case persistent_kw:
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	2517 case global_kw:
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	2518 looking_at_decl_list = true;
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	2519 break;
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	2520
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2521 case case_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2522 case elseif_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2523 case until_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2524 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2525
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2526 case end_kw:
14645 cbc00b587f36 also allow "end" indexing in classdef files John W. Eaton <jwe@octave.org> parents: 14642 diff changeset	2527 if (inside_any_object_index ()
18341 02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18340 diff changeset	2528 \|\| (defining_func
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18340 diff changeset	2529 && ! (looking_at_return_list
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18340 diff changeset	2530 \|\| parsed_function_name.top ())))
18319 f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2531 {
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2532 at_beginning_of_statement = previous_at_bos;
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2533 return 0;
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2534 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2535
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2536 tok_val = new token (end_kw, token::simple_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2537 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2538 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2539
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2540 case end_try_catch_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2541 tok_val = new token (end_try_catch_kw, token::try_catch_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2542 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2543 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2544
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2545 case end_unwind_protect_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2546 tok_val = new token (end_unwind_protect_kw,
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2547 token::unwind_protect_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2548 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2549 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2550
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2551 case endfor_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2552 tok_val = new token (endfor_kw, token::for_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2553 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2554 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2555
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2556 case endfunction_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2557 tok_val = new token (endfunction_kw, token::function_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2558 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2559 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2560
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2561 case endif_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2562 tok_val = new token (endif_kw, token::if_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2563 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2564 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2565
13246 0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	2566 case endparfor_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2567 tok_val = new token (endparfor_kw, token::parfor_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2568 at_beginning_of_statement = true;
13246 0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	2569 break;
0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	2570
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2571 case endswitch_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2572 tok_val = new token (endswitch_kw, token::switch_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2573 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2574 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2575
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2576 case endwhile_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2577 tok_val = new token (endwhile_kw, token::while_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2578 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2579 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2580
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2581 case endclassdef_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2582 tok_val = new token (endclassdef_kw, token::classdef_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2583 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2584 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2585
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2586 case endenumeration_kw:
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2587 tok_val = new token (endenumeration_kw, token::enumeration_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2588 at_beginning_of_statement = true;
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2589 break;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2590
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2591 case endevents_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2592 tok_val = new token (endevents_kw, token::events_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2593 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2594 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2595
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2596 case endmethods_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2597 tok_val = new token (endmethods_kw, token::methods_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2598 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2599 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2600
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2601 case endproperties_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2602 tok_val = new token (endproperties_kw, token::properties_end, l, c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2603 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2604 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2605
13245 027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13237 diff changeset	2606
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2607 case for_kw:
13245 027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13237 diff changeset	2608 case parfor_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2609 case while_kw:
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	2610 decrement_promptflag ();
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2611 looping++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2612 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2613
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2614 case do_kw:
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2615 at_beginning_of_statement = true;
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	2616 decrement_promptflag ();
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2617 looping++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2618 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2619
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2620 case try_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2621 case unwind_protect_kw:
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2622 at_beginning_of_statement = true;
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	2623 decrement_promptflag ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2624 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2625
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2626 case if_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2627 case switch_kw:
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	2628 decrement_promptflag ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2629 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2630
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2631 case get_kw:
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2632 case set_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2633 // 'get' and 'set' are keywords in classdef method
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2634 // declarations.
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2635 if (! maybe_classdef_get_set_method)
18319 f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2636 {
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2637 at_beginning_of_statement = previous_at_bos;
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2638 return 0;
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2639 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2640 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2641
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2642 case enumeration_kw:
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2643 case events_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2644 case methods_kw:
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2645 case properties_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2646 // 'properties', 'methods' and 'events' are keywords for
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2647 // classdef blocks.
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2648 if (! parsing_classdef)
18319 f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2649 {
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2650 at_beginning_of_statement = previous_at_bos;
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2651 return 0;
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2652 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2653 // fall through ...
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2654
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2655 case classdef_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2656 // 'classdef' is always a keyword.
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	2657 decrement_promptflag ();
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2658
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2659 if (! force_script && token_count == 0 && input_from_file ())
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2660 {
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2661 reading_classdef_file = true;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2662 reading_script_file = false;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2663 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2664 break;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2665
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2666 case function_kw:
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	2667 decrement_promptflag ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2668
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2669 defining_func++;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2670 parsed_function_name.push (false);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2671
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2672 if (! force_script && token_count == 0 && input_from_file ())
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2673 {
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2674 reading_fcn_file = true;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2675 reading_script_file = false;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2676 }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2677
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2678 if (! (reading_fcn_file \|\| reading_script_file
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2679 \|\| reading_classdef_file))
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2680 input_line_number = 1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2681 break;
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2682
3174 390d5e396682 [project @ 1998-05-04 16:36:17 by jwe] jwe parents: 3165 diff changeset	2683 case magic_file_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2684 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2685 if ((reading_fcn_file \|\| reading_script_file
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2686 \|\| reading_classdef_file)
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2687 && ! fcn_file_full_name.empty ())
19858 77f65eabac20 avoid crash when __FILE__ is used at top level (bug #44363) John W. Eaton <jwe@octave.org> parents: 19593 diff changeset	2688 tok_val = new token (magic_file_kw, fcn_file_full_name, l, c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2689 else
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2690 tok_val = new token (magic_file_kw, "stdin", l, c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2691 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2692 break;
3174 390d5e396682 [project @ 1998-05-04 16:36:17 by jwe] jwe parents: 3165 diff changeset	2693
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe] jwe parents: 3165 diff changeset	2694 case magic_line_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2695 tok_val = new token (magic_line_kw, static_cast<double> (l),
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2696 "", l, c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2697 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2698
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2699 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2700 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2701 }
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2702
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	2703 if (! tok_val)
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2704 tok_val = new token (kw->tok, true, l, c);
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	2705
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	2706 push_token (tok_val);
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2707
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2708 return kw->tok;
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 120 diff changeset	2709 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2710
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2711 return 0;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2712 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2713
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2714 bool
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2715 octave_base_lexer::fq_identifier_contains_keyword (const std::string& s)
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2716 {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2717 size_t p1 = 0;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2718 size_t p2;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2719
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2720 std::string s_part;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2721
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2722 do
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2723 {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2724 p2 = s.find ('.', p1);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2725
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2726 if (p2 != std::string::npos)
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2727 {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2728 s_part = s.substr (p1, p2 - p1);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2729 p1 = p2 + 1;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2730 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2731 else
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2732 s_part = s.substr (p1);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2733
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2734 if (is_keyword_token (s_part))
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2735 return true;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2736 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2737 while (p2 != std::string::npos);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2738
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2739 return false;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2740 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2741
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2742 bool
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2743 octave_base_lexer::whitespace_is_significant (void)
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2744 {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2745 return (nesting_level.is_bracket ()
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2746 \|\| (nesting_level.is_brace ()
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2747 && ! looking_at_object_index.front ()));
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2748 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2749
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2750 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	2751 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	2752 {
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2753 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	2754 }
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2755
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2756 static inline bool
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2757 looks_like_hex (const char *s, int len)
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2758 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2759 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	2760 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2761
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2762 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2763 octave_base_lexer::handle_number (void)
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2764 {
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2765 double value = 0.0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2766 int nread = 0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2767
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2768 char *yytxt = flex_yytext ();
210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2769
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2770 // Strip any underscores
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2771 char *tmptxt = strsave (yytxt);
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2772 char *rptr = tmptxt;
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2773 char *wptr = tmptxt;
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2774 while (*rptr)
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2775 {
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2776 wptr = rptr++;
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2777 wptr += (*wptr != '_');
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2778 }
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2779 *wptr = '\0';
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2780
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2781 if (looks_like_hex (tmptxt, strlen (tmptxt)))
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2782 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2783 unsigned long ival;
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2784
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2785 nread = sscanf (tmptxt, "%lx", &ival);
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2786
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2787 value = static_cast<double> (ival);
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2788 }
20589 7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2789 else if (looks_like_bin (tmptxt, strlen (tmptxt)))
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2790 {
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2791 uint64_t ivalue = 0;
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2792
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	2793 for (size_t i = 0; i < strlen (tmptxt); i++)
20589 7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2794 {
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2795 ivalue <<= 1;
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2796 ivalue += static_cast<uint64_t> (tmptxt[i] == '1');
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2797 }
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2798
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2799 value = static_cast<double> (ivalue);
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2800 nread = 1; // Just to pass the assert stmt below
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2801 }
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2802 else
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2803 {
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2804 char *idx = strpbrk (tmptxt, "Dd");
2621 337a09dd1c06 [project @ 1997-01-24 21:49:41 by jwe] jwe parents: 2614 diff changeset	2805
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2806 if (idx)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2807 *idx = 'e';
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2808
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2809 nread = sscanf (tmptxt, "%lf", &value);
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2810 }
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2811
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2812 delete [] tmptxt;
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2813
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	2814 // If yytext doesn't contain a valid number, we are in deep doo doo.
985 4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	2815
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2816 assert (nread == 1);
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2817
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2818 looking_for_object_index = false;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2819 at_beginning_of_statement = false;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2820
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2821 push_token (new token (NUM, value, yytxt, input_line_number,
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	2822 current_input_column));
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2823
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2824 current_input_column += flex_yyleng ();
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2825 }
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2826
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2827 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2828 octave_base_lexer::handle_continuation (void)
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2829 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2830 char *yytxt = flex_yytext ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2831 int yylng = flex_yyleng ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2832
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2833 int offset = 1;
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2834 if (yytxt[0] == '\\')
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2835 warn_language_extension_continuation ();
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2836 else
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2837 offset = 3;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2838
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2839 bool have_space = false;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2840 while (offset < yylng)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2841 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2842 char c = yytxt[offset];
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2843 if (c == ' ' \|\| c == '\t')
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2844 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2845 have_space = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2846 offset++;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2847 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2848 else
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2849 break;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2850 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2851
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2852 if (have_space)
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2853 mark_previous_token_trailing_space ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2854
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2855 bool have_comment = false;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2856 while (offset < yylng)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2857 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2858 char c = yytxt[offset];
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2859 if (c == '#' \|\| c == '%')
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2860 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2861 have_comment = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2862 offset++;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2863 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2864 else
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2865 break;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2866 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2867
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2868 if (have_comment)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2869 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2870 comment_text = &yytxt[offset];
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2871
18246 1f072ae35ede fix parsing of single quote after continuation and comment (bug #41048) John W. Eaton <jwe@octave.org> parents: 18135 diff changeset	2872 // finish_comment sets at_beginning_of_statement to true but
1f072ae35ede fix parsing of single quote after continuation and comment (bug #41048) John W. Eaton <jwe@octave.org> parents: 18135 diff changeset	2873 // that's not be correct if we are handling a continued
1f072ae35ede fix parsing of single quote after continuation and comment (bug #41048) John W. Eaton <jwe@octave.org> parents: 18135 diff changeset	2874 // statement. Preserve the current state.
1f072ae35ede fix parsing of single quote after continuation and comment (bug #41048) John W. Eaton <jwe@octave.org> parents: 18135 diff changeset	2875
1f072ae35ede fix parsing of single quote after continuation and comment (bug #41048) John W. Eaton <jwe@octave.org> parents: 18135 diff changeset	2876 bool saved_bos = at_beginning_of_statement;
1f072ae35ede fix parsing of single quote after continuation and comment (bug #41048) John W. Eaton <jwe@octave.org> parents: 18135 diff changeset	2877
16337 6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549) John W. Eaton <jwe@octave.org> parents: 16334 diff changeset	2878 finish_comment (octave_comment_elt::end_of_line);
18246 1f072ae35ede fix parsing of single quote after continuation and comment (bug #41048) John W. Eaton <jwe@octave.org> parents: 18135 diff changeset	2879
1f072ae35ede fix parsing of single quote after continuation and comment (bug #41048) John W. Eaton <jwe@octave.org> parents: 18135 diff changeset	2880 at_beginning_of_statement = saved_bos;
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2881 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2882
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2883 decrement_promptflag ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2884 input_line_number++;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2885 current_input_column = 1;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2886 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2887
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2888 void
16337 6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549) John W. Eaton <jwe@octave.org> parents: 16334 diff changeset	2889 octave_base_lexer::finish_comment (octave_comment_elt::comment_type typ)
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2890 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2891 bool copyright = looks_like_copyright (comment_text);
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2892
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2893 if (nesting_level.none () && help_text.empty ()
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2894 && ! comment_text.empty () && ! copyright)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2895 help_text = comment_text;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2896
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2897 if (copyright)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2898 typ = octave_comment_elt::copyright;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2899
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17355 diff changeset	2900 comment_buf.append (comment_text, typ);
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2901
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2902 comment_text = "";
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2903
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2904 at_beginning_of_statement = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2905 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2906
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2907 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2908 octave_base_lexer::handle_close_bracket (int bracket_type)
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2909 {
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4608 diff changeset	2910 int retval = bracket_type;
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2911
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2912 if (! nesting_level.none ())
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2913 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2914 nesting_level.remove ();
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2915
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2916 if (bracket_type == ']')
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2917 bracketflag--;
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2918 else if (bracket_type == '}')
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2919 braceflag--;
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2920 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2921 panic_impossible ();
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2922 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2923
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2924 pop_start_state ();
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2925
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2926 return retval;
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2927 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2928
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2929 bool
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2930 octave_base_lexer::looks_like_command_arg (void)
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2931 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2932 bool space_before = space_follows_previous_token ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2933 bool space_after = looking_at_space ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2934
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2935 return (space_before && ! space_after
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2936 && previous_token_may_be_command ());
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2937 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2938
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2939 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2940 octave_base_lexer::handle_superclass_identifier (void)
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2941 {
16280 0dc6731fc0da avoid eat_continuation in classdef branch John W. Eaton <jwe@octave.org> parents: 16278 diff changeset	2942 std::string meth = flex_yytext ();
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	2943
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2944 size_t pos = meth.find ("@");
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	2945 std::string cls = meth.substr (pos + 1);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	2946 meth = meth.substr (0, pos);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2947
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2948 bool kw_token = (is_keyword_token (meth)
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2949 \|\| fq_identifier_contains_keyword (cls));
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2950
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2951 if (kw_token)
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2952 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2953 token *tok
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2954 = new token (LEXICAL_ERROR,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2955 "method, class, and package names may not be keywords",
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2956 input_line_number, current_input_column);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2957
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2958 push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2959
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2960 return count_token_internal (LEXICAL_ERROR);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2961 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2962
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2963 push_token (new token (SUPERCLASSREF, meth, cls,
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	2964 input_line_number, current_input_column));
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2965
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2966 current_input_column += flex_yyleng ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2967
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2968 return SUPERCLASSREF;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2969 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2970
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2971 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2972 octave_base_lexer::handle_meta_identifier (void)
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2973 {
16280 0dc6731fc0da avoid eat_continuation in classdef branch John W. Eaton <jwe@octave.org> parents: 16278 diff changeset	2974 std::string cls = std::string(flex_yytext ()).substr (1);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2975
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2976 if (fq_identifier_contains_keyword (cls))
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2977 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2978 token *tok = new token (LEXICAL_ERROR,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2979 "class and package names may not be keywords",
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2980 input_line_number, current_input_column);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2981 push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2982
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2983 return count_token_internal (LEXICAL_ERROR);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2984 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2985
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2986 push_token (new token (METAQUERY, cls, input_line_number,
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	2987 current_input_column));
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2988
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2989 current_input_column += flex_yyleng ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2990
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2991 return METAQUERY;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2992 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2993
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2994 int
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2995 octave_base_lexer::handle_fq_identifier (void)
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2996 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2997 std::string fq_id = flex_yytext ();
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2998
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	2999 if (fq_identifier_contains_keyword (fq_id))
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3000 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3001 token *tok
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3002 = new token (LEXICAL_ERROR,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3003 "function, method, class, and package names may not be keywords",
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3004 input_line_number, current_input_column);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3005
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3006 push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3007
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3008 return count_token_internal (LEXICAL_ERROR);
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3009 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3010
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3011 push_token (new token (FQ_IDENT, fq_id, input_line_number,
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3012 current_input_column));
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3013
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3014 current_input_column += flex_yyleng ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3015
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3016 return FQ_IDENT;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3017 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3018
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	3019 // Figure out exactly what kind of token to return when we have seen
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	3020 // an identifier. Handles keywords. Return -1 if the identifier
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	3021 // should be ignored.
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	3022
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3023 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3024 octave_base_lexer::handle_identifier (void)
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3025 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3026 std::string ident = flex_yytext ();
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	3027
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3028 // If we are expecting a structure element, avoid recognizing
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3029 // keywords and other special names and return STRUCT_ELT, which is
20188 e679dc89e64b allow keywords as structure fields again (bug #45092) John W. Eaton <jwe@octave.org> parents: 20184 diff changeset	3030 // a string that is also a valid identifier.
747 6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe] jwe parents: 661 diff changeset	3031
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3032 if (looking_at_indirect_ref)
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	3033 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3034 push_token (new token (STRUCT_ELT, ident, input_line_number,
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3035 current_input_column));
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3036
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3037 looking_for_object_index = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3038
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3039 current_input_column += flex_yyleng ();
2819 ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe] jwe parents: 2804 diff changeset	3040
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3041 return STRUCT_ELT;
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	3042 }
747 6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe] jwe parents: 661 diff changeset	3043
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3044 // If ident is a keyword token, then is_keyword_token will set
20188 e679dc89e64b allow keywords as structure fields again (bug #45092) John W. Eaton <jwe@octave.org> parents: 20184 diff changeset	3045 // at_beginning_of_statement. For example, if tok is an IF
e679dc89e64b allow keywords as structure fields again (bug #45092) John W. Eaton <jwe@octave.org> parents: 20184 diff changeset	3046 // token, then at_beginning_of_statement will be false.
e679dc89e64b allow keywords as structure fields again (bug #45092) John W. Eaton <jwe@octave.org> parents: 20184 diff changeset	3047
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3048 int kw_token = is_keyword_token (ident);
20188 e679dc89e64b allow keywords as structure fields again (bug #45092) John W. Eaton <jwe@octave.org> parents: 20184 diff changeset	3049
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3050 if (looking_at_function_handle)
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3051 {
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3052 if (kw_token)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3053 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3054 token *tok
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3055 = new token (LEXICAL_ERROR,
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3056 "function handles may not refer to keywords",
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3057 input_line_number, current_input_column);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3058
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3059 push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3060
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3061 return count_token_internal (LEXICAL_ERROR);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3062 }
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3063 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3064 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3065 push_token (new token (FCN_HANDLE, ident, input_line_number,
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3066 current_input_column));
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3067
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3068 current_input_column += flex_yyleng ();
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3069 looking_for_object_index = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3070
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3071 at_beginning_of_statement = false;
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3072
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3073 return FCN_HANDLE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3074 }
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3075 }
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3076
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	3077 // If we have a regular keyword, return it.
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3078 // Keywords can be followed by identifiers.
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3079
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3080 if (kw_token)
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3081 {
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3082 if (kw_token >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3083 {
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3084 current_input_column += flex_yyleng ();
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3085 looking_for_object_index = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3086 }
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3087
16783 0bf1d559b321 always set at_beginning_of_statement when recognizing keywords (bug #38758) John W. Eaton <jwe@octave.org> parents: 16756 diff changeset	3088 // The call to is_keyword_token set at_beginning_of_statement.
0bf1d559b321 always set at_beginning_of_statement when recognizing keywords (bug #38758) John W. Eaton <jwe@octave.org> parents: 16756 diff changeset	3089
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3090 return kw_token;
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3091 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3092
17355 f0edd6c752e9 don't convert "end" token to "__end__" for indexing John W. Eaton <jwe@octave.org> parents: 17343 diff changeset	3093 // Find the token in the symbol table.
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3094
16320 09f0cb9cac7d don't modify symbol table scope in the parser John W. Eaton <jwe@octave.org> parents: 16309 diff changeset	3095 symbol_table::scope_id sid = symtab_context.curr_scope ();
09f0cb9cac7d don't modify symbol table scope in the parser John W. Eaton <jwe@octave.org> parents: 16309 diff changeset	3096
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3097 token *tok = new token (NAME, &(symbol_table::insert (ident, sid)),
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3098 input_line_number, current_input_column);
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3099
16788 f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	3100 // The following symbols are handled specially so that things like
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	3101 //
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	3102 // pi +1
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	3103 //
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	3104 // are parsed as an addition expression instead of as a command-style
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	3105 // function call with the argument "+1".
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	3106
16269 488b0fef52c5 7/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16267 diff changeset	3107 if (at_beginning_of_statement
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3108 && (! (is_variable (ident)
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3109 \|\| ident == "e" \|\| ident == "pi"
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3110 \|\| ident == "I" \|\| ident == "i"
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3111 \|\| ident == "J" \|\| ident == "j"
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3112 \|\| ident == "Inf" \|\| ident == "inf"
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3113 \|\| ident == "NaN" \|\| ident == "nan")))
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3114 tok->mark_may_be_command ();
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3115
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3116 push_token (tok);
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3117
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3118 current_input_column += flex_yyleng ();
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3119
17355 f0edd6c752e9 don't convert "end" token to "__end__" for indexing John W. Eaton <jwe@octave.org> parents: 17343 diff changeset	3120 // The magic end index can't be indexed.
f0edd6c752e9 don't convert "end" token to "__end__" for indexing John W. Eaton <jwe@octave.org> parents: 17343 diff changeset	3121
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	3122 if (ident != "end")
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3123 looking_for_object_index = true;
9324 29563379fa9b don't look for object index after keyword John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	3124
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3125 at_beginning_of_statement = false;
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3126
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3127 return NAME;
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3128 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3129
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3130 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3131 octave_base_lexer::maybe_warn_separator_insert (char sep)
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3132 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3133 std::string nm = fcn_file_full_name;
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3134
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3135 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3136 warning_with_id ("Octave:separator-insert",
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3137 "potential auto-insertion of '%c' near line %d",
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3138 sep, input_line_number);
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3139 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3140 warning_with_id ("Octave:separator-insert",
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3141 "potential auto-insertion of '%c' near line %d of file %s",
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3142 sep, input_line_number, nm.c_str ());
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3143 }
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3144
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3145 void
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	3146 octave_base_lexer::warn_single_quote_string (void)
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3147 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3148 std::string nm = fcn_file_full_name;
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3149
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3150 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3151 warning_with_id ("Octave:single-quote-string",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3152 "single quote delimited string near line %d",
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3153 input_line_number);
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3154 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3155 warning_with_id ("Octave:single-quote-string",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3156 "single quote delimited string near line %d of file %s",
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3157 input_line_number, nm.c_str ());
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3158 }
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3159
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3160 void
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	3161 octave_base_lexer::warn_language_extension (const std::string& msg)
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3162 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3163 std::string nm = fcn_file_full_name;
8974 fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3164
fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3165 if (nm.empty ())
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3166 warning_with_id ("Octave:language-extension",
e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3167 "Octave language extension used: %s",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3168 msg.c_str ());
8974 fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3169 else
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3170 warning_with_id ("Octave:language-extension",
e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3171 "Octave language extension used: %s near line %d offile %s",
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3172 msg.c_str (), input_line_number, nm.c_str ());
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3173 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3174
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3175 void
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	3176 octave_base_lexer::maybe_warn_language_extension_comment (char c)
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3177 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3178 if (c == '#')
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	3179 warn_language_extension ("# used as comment character");
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3180 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3181
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3182 void
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	3183 octave_base_lexer::warn_language_extension_continuation (void)
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3184 {
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	3185 warn_language_extension ("\\ used as line continuation marker");
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3186 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3187
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3188 void
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	3189 octave_base_lexer::warn_language_extension_operator (const std::string& op)
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3190 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3191 std::string t = op;
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3192 int n = t.length ();
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3193 if (t[n-1] == '\n')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3194 t.resize (n-1);
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	3195 warn_language_extension (t + " used as operator");
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3196 }
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3197
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3198 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3199 octave_base_lexer::push_token (token *tok)
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3200 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3201 YYSTYPE *lval = yyget_lval (scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3202 lval->tok_val = tok;
16230 4bf907906134 use a queue to hold tokens in the lexer John W. Eaton <jwe@octave.org> parents: 16229 diff changeset	3203 tokens.push (tok);
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3204 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3205
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3206 token *
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3207 octave_base_lexer::current_token (void)
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3208 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3209 YYSTYPE *lval = yyget_lval (scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3210 return lval->tok_val;
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3211 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3212
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3213 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3214 octave_base_lexer::display_token (int tok)
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3215 {
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3216 switch (tok)
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3217 {
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3218 case '=': std::cerr << "'='\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3219 case ':': std::cerr << "':'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3220 case '-': std::cerr << "'-'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3221 case '+': std::cerr << "'+'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3222 case '': std::cerr << "''\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3223 case '/': std::cerr << "'/'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3224 case ADD_EQ: std::cerr << "ADD_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3225 case SUB_EQ: std::cerr << "SUB_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3226 case MUL_EQ: std::cerr << "MUL_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3227 case DIV_EQ: std::cerr << "DIV_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3228 case LEFTDIV_EQ: std::cerr << "LEFTDIV_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3229 case POW_EQ: std::cerr << "POW_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3230 case EMUL_EQ: std::cerr << "EMUL_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3231 case EDIV_EQ: std::cerr << "EDIV_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3232 case ELEFTDIV_EQ: std::cerr << "ELEFTDIV_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3233 case EPOW_EQ: std::cerr << "EPOW_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3234 case AND_EQ: std::cerr << "AND_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3235 case OR_EQ: std::cerr << "OR_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3236 case EXPR_AND_AND: std::cerr << "EXPR_AND_AND\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3237 case EXPR_OR_OR: std::cerr << "EXPR_OR_OR\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3238 case EXPR_AND: std::cerr << "EXPR_AND\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3239 case EXPR_OR: std::cerr << "EXPR_OR\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3240 case EXPR_NOT: std::cerr << "EXPR_NOT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3241 case EXPR_LT: std::cerr << "EXPR_LT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3242 case EXPR_LE: std::cerr << "EXPR_LE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3243 case EXPR_EQ: std::cerr << "EXPR_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3244 case EXPR_NE: std::cerr << "EXPR_NE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3245 case EXPR_GE: std::cerr << "EXPR_GE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3246 case EXPR_GT: std::cerr << "EXPR_GT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3247 case LEFTDIV: std::cerr << "LEFTDIV\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3248 case EMUL: std::cerr << "EMUL\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3249 case EDIV: std::cerr << "EDIV\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3250 case ELEFTDIV: std::cerr << "ELEFTDIV\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3251 case EPLUS: std::cerr << "EPLUS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3252 case EMINUS: std::cerr << "EMINUS\n"; break;
16284 09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. John W. Eaton <jwe@octave.org> parents: 16283 diff changeset	3253 case HERMITIAN: std::cerr << "HERMITIAN\n"; break;
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3254 case TRANSPOSE: std::cerr << "TRANSPOSE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3255 case PLUS_PLUS: std::cerr << "PLUS_PLUS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3256 case MINUS_MINUS: std::cerr << "MINUS_MINUS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3257 case POW: std::cerr << "POW\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3258 case EPOW: std::cerr << "EPOW\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3259
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3260 case NUM:
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3261 case IMAG_NUM:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3262 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3263 token *tok_val = current_token ();
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3264 std::cerr << (tok == NUM ? "NUM" : "IMAG_NUM")
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3265 << " [" << tok_val->number () << "]\n";
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3266 }
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3267 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3268
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3269 case STRUCT_ELT:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3270 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3271 token *tok_val = current_token ();
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3272 std::cerr << "STRUCT_ELT [" << tok_val->text () << "]\n";
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3273 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3274 break;
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3275
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3276 case NAME:
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3277 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3278 token *tok_val = current_token ();
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3279 symbol_table::symbol_record *sr = tok_val->sym_rec ();
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3280 std::cerr << "NAME";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3281 if (sr)
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3282 std::cerr << " [" << sr->name () << "]";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3283 std::cerr << "\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3284 }
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3285 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3286
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3287 case END: std::cerr << "END\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3288
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3289 case DQ_STRING:
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3290 case SQ_STRING:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3291 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3292 token *tok_val = current_token ();
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3293
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3294 std::cerr << (tok == DQ_STRING ? "DQ_STRING" : "SQ_STRING")
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3295 << " [" << tok_val->text () << "]\n";
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3296 }
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3297 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3298
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3299 case FOR: std::cerr << "FOR\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3300 case WHILE: std::cerr << "WHILE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3301 case DO: std::cerr << "DO\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3302 case UNTIL: std::cerr << "UNTIL\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3303 case IF: std::cerr << "IF\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3304 case ELSEIF: std::cerr << "ELSEIF\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3305 case ELSE: std::cerr << "ELSE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3306 case SWITCH: std::cerr << "SWITCH\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3307 case CASE: std::cerr << "CASE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3308 case OTHERWISE: std::cerr << "OTHERWISE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3309 case BREAK: std::cerr << "BREAK\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3310 case CONTINUE: std::cerr << "CONTINUE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3311 case FUNC_RET: std::cerr << "FUNC_RET\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3312 case UNWIND: std::cerr << "UNWIND\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3313 case CLEANUP: std::cerr << "CLEANUP\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3314 case TRY: std::cerr << "TRY\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3315 case CATCH: std::cerr << "CATCH\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3316 case GLOBAL: std::cerr << "GLOBAL\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3317 case PERSISTENT: std::cerr << "PERSISTENT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3318 case FCN_HANDLE: std::cerr << "FCN_HANDLE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3319 case END_OF_INPUT: std::cerr << "END_OF_INPUT\n\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3320 case LEXICAL_ERROR: std::cerr << "LEXICAL_ERROR\n\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3321 case FCN: std::cerr << "FCN\n"; break;
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3322 case INPUT_FILE: std::cerr << "INPUT_FILE\n"; break;
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3323 case SUPERCLASSREF: std::cerr << "SUPERCLASSREF\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3324 case METAQUERY: std::cerr << "METAQUERY\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3325 case GET: std::cerr << "GET\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3326 case SET: std::cerr << "SET\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3327 case PROPERTIES: std::cerr << "PROPERTIES\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3328 case METHODS: std::cerr << "METHODS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3329 case EVENTS: std::cerr << "EVENTS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3330 case CLASSDEF: std::cerr << "CLASSDEF\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3331 case '\n': std::cerr << "\\n\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3332 case '\r': std::cerr << "\\r\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3333 case '\t': std::cerr << "TAB\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3334 default:
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3335 {
16166 cb80b1d062b1 don't attempt to print unprintable tokens John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	3336 if (tok < 256 && tok > 31)
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3337 std::cerr << static_cast<char> (tok) << "\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3338 else
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3339 std::cerr << "UNKNOWN(" << tok << ")\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3340 }
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3341 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3342 }
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3343 }
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3344
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3345 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3346 octave_base_lexer::fatal_error (const char *msg)
16129 053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3347 {
21074 9ff2ae6cd5b0 rework fatal flex error handler (bug #46877) John W. Eaton <jwe@octave.org> parents: 21064 diff changeset	3348 error ("fatal lexer error: %s", msg);
16129 053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3349 }
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3350
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3351 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3352 octave_base_lexer::lexer_debug (const char *pattern)
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3353 {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3354 if (lexer_debug_flag)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3355 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3356 std::cerr << std::endl;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3357
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3358 display_start_state ();
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3359
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3360 std::cerr << "P: " << pattern << std::endl;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3361 std::cerr << "T: " << flex_yytext () << std::endl;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3362 }
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3363 }
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3364
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3365 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3366 octave_base_lexer::push_start_state (int state)
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3367 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3368 OCTAVE_YYG;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3369
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3370 start_state_stack.push (state);
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3371
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3372 BEGIN (start_state ());
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3373 }
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3374
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3375 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3376 octave_base_lexer::pop_start_state (void)
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3377 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3378 OCTAVE_YYG;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3379
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3380 start_state_stack.pop ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3381
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3382 BEGIN (start_state ());
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3383 }
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3384
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3385 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3386 octave_base_lexer::clear_start_state (void)
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3387 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3388 while (! start_state_stack.empty ())
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3389 start_state_stack.pop ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3390
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3391 push_start_state (INITIAL);
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3392 }
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3393
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3394 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3395 octave_base_lexer::display_start_state (void) const
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3396 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3397 std::cerr << "S: ";
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3398
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3399 switch (start_state ())
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3400 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3401 case INITIAL:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3402 std::cerr << "INITIAL" << std::endl;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3403 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3404
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3405 case COMMAND_START:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3406 std::cerr << "COMMAND_START" << std::endl;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3407 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3408
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3409 case MATRIX_START:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3410 std::cerr << "MATRIX_START" << std::endl;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3411 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3412
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3413 case INPUT_FILE_START:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3414 std::cerr << "INPUT_FILE_BEGIN" << std::endl;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3415 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3416
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3417 case BLOCK_COMMENT_START:
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3418 std::cerr << "BLOCK_COMMENT_START" << std::endl;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3419 break;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3420
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3421 case LINE_COMMENT_START:
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3422 std::cerr << "LINE_COMMENT_START" << std::endl;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3423 break;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3424
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3425 case DQ_STRING_START:
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3426 std::cerr << "DQ_STRING_START" << std::endl;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3427 break;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3428
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3429 case SQ_STRING_START:
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3430 std::cerr << "SQ_STRING_START" << std::endl;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3431 break;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3432
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3433 default:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3434 std::cerr << "UNKNOWN START STATE!" << std::endl;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3435 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3436 }
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3437 }
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3438
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3439 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3440 octave_base_lexer::handle_op (const char *pattern, int tok, bool bos)
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3441 {
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3442 lexer_debug (pattern);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3443
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	3444 return handle_op_internal (tok, bos, true);
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3445 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3446
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3447 int
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3448 octave_base_lexer::handle_language_extension_op (const char *pattern, int tok,
e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3449 bool bos)
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3450 {
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3451 lexer_debug (pattern);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3452
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	3453 return handle_op_internal (tok, bos, false);
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3454 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3455
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3456 bool
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3457 octave_base_lexer::maybe_unput_comma_before_unary_op (int tok)
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3458 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3459 int prev_tok = previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3460
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3461 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3462
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3463 if (whitespace_is_significant () && space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3464 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3465 int c = text_yyinput ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3466 xunput (c);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3467
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3468 bool space_after = (c == ' ' \|\| c == '\t');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3469
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	3470 if (! (prev_tok == '[' \|\| prev_tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3471 \|\| previous_token_is_binop ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3472 \|\| ((tok == '+' \|\| tok == '-') && space_after)))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3473 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3474 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3475
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3476 return unput_comma;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3477 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3478
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3479 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3480 octave_base_lexer::handle_unary_op (int tok, bool bos)
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3481 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3482 return maybe_unput_comma_before_unary_op (tok)
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	3483 ? -1 : handle_op_internal (tok, bos, true);
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3484 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3485
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3486 int
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3487 octave_base_lexer::handle_language_extension_unary_op (int tok, bool bos)
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3488 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3489 return maybe_unput_comma_before_unary_op (tok)
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	3490 ? -1 : handle_op_internal (tok, bos, false);
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3491 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3492
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3493 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3494 octave_base_lexer::handle_op_internal (int tok, bool bos, bool compat)
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3495 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3496 if (! compat)
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	3497 warn_language_extension_operator (flex_yytext ());
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3498
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	3499 push_token (new token (tok, input_line_number, current_input_column));
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3500
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3501 current_input_column += flex_yyleng ();
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3502 looking_for_object_index = false;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3503 at_beginning_of_statement = bos;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3504
16643 4258750c76ed don't push operator tokens twice John W. Eaton <jwe@octave.org> parents: 16365 diff changeset	3505 return count_token_internal (tok);
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3506 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3507
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3508 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3509 octave_base_lexer::handle_token (const std::string& name, int tok)
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3510 {
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	3511 token *tok_val = new token (tok, name, input_line_number,
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	3512 current_input_column);
16231 2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3513
2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3514 return handle_token (tok, tok_val);
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3515 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3516
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3517 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3518 octave_base_lexer::handle_token (int tok, token *tok_val)
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3519 {
16231 2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3520 if (! tok_val)
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	3521 tok_val = new token (tok, input_line_number, current_input_column);
16231 2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3522
2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3523 push_token (tok_val);
2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3524
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3525 current_input_column += flex_yyleng ();
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3526
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3527 return count_token_internal (tok);
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3528 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3529
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3530 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3531 octave_base_lexer::count_token (int tok)
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3532 {
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3533 token *tok_val = new token (tok, input_line_number, current_input_column);
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3534
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3535 push_token (tok_val);
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3536
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3537 return count_token_internal (tok);
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3538 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3539
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3540 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3541 octave_base_lexer::count_token_internal (int tok)
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3542 {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3543 if (tok != '\n')
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3544 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3545 Vtoken_count++;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3546 token_count++;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3547 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3548
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3549 return show_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3550 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3551
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3552 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3553 octave_base_lexer::show_token (int tok)
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3554 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3555 if (Vdisplay_tokens)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3556 display_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3557
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3558 if (lexer_debug_flag)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3559 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3560 std::cerr << "R: ";
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3561 display_token (tok);
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3562 std::cerr << std::endl;
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3563 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3564
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3565 return tok;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3566 }
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3567
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3568 void
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3569 octave_base_lexer::enable_fq_identifier (void)
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3570 {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3571 push_start_state (FQ_IDENT_START);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3572 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3573
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3574 int
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3575 octave_lexer::fill_flex_buffer (char *buf, unsigned max_size)
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3576 {
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3577 int status = 0;
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3578
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3579 if (input_buf.empty ())
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3580 {
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3581 bool eof = false;
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3582 current_input_line = input_reader.get_input (eof);
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3583 input_buf.fill (current_input_line, eof);
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3584 }
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3585
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3586 if (! input_buf.empty ())
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3587 status = input_buf.copy_chunk (buf, max_size);
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3588 else
19379 c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 19285 diff changeset	3589 status = YY_NULL;
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3590
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3591 return status;
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3592 }
16294 0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3593
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3594 int
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3595 octave_push_lexer::fill_flex_buffer (char *buf, unsigned max_size)
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3596 {
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3597 int status = 0;
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3598
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3599 if (input_buf.empty () && ! input_buf.at_eof ())
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3600 input_buf.fill (std::string (1, static_cast<char> (1)), false);
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3601
16294 0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3602 if (! input_buf.empty ())
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3603 status = input_buf.copy_chunk (buf, max_size);
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3604 else
19379 c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 19285 diff changeset	3605 status = YY_NULL;
16294 0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3606
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3607 return status;
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3608 }
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	3609

Mercurial > octave

annotate libinterp/parse-tree/lex.ll @ 21369:105224df2330