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

annotate libinterp/parse-tree/lex.ll @ 21055:5e00ed38a58b

maint: Replace if/error/else paradigm with just if/error. * __ilu__.cc, data.cc, file-io.cc, graphics.cc, graphics.in.h, ls-mat5.cc, lu.cc, octave-link.cc, regexp.cc, schur.cc, spparms.cc, sub2ind.cc, syscalls.cc, toplev.cc, variables.cc, xpow.cc, audiodevinfo.cc, ccolamd.cc, ov-builtin.cc, ov-classdef.cc, ov-intx.h, ov-lazy-idx.cc, ov-mex-fcn.cc, op-int.h, lex.ll, oct-parse.in.yy, pt-binop.cc, pt-cbinop.cc, pt-const.cc, pt-decl.h, pt-fcn-handle.cc, pt-unop.cc, CollocWt.cc: Replace if/error/else paradigm with just if/error.

author	Rik <rik@octave.org>
date	Wed, 13 Jan 2016 11:02:22 -0800
parents	ec532a439c6f
children	a9f2c2d72892

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
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	36 #include <config.h>
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
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	50 }
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	51
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	52 %option prefix = "octave_"
16146 b6050fc0a2d9 use %option noyywrap John W. Eaton <jwe@octave.org> parents: 16139 diff changeset	53 %option noyywrap
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	54 %option reentrant
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	55 %option bison-bridge
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	56
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	57 %option noyyalloc
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	58 %option noyyrealloc
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	59 %option noyyfree
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	60
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	61 %x COMMAND_START
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	62 %s MATRIX_START
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	63
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	64 %x INPUT_FILE_START
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	65
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	66 %x BLOCK_COMMENT_START
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	67 %x LINE_COMMENT_START
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	68
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	69 %x DQ_STRING_START
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	70 %x SQ_STRING_START
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	71
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	72 %x FQ_IDENT_START
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	73
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	74 %{
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 216 diff changeset	75
1341 e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	76 #include <cctype>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	77 #include <cstring>
20589 7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	78 #include <stdint.h>
1341 e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	79
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	80 #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	81 #include <set>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5615 diff changeset	82 #include <sstream>
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	83 #include <string>
4214 b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe] jwe parents: 4208 diff changeset	84 #include <stack>
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	85
4093 5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4064 diff changeset	86 #include <sys/types.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4064 diff changeset	87 #include <unistd.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4064 diff changeset	88
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2900 diff changeset	89 #include "cmd-edit.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4131 diff changeset	90 #include "quit.h"
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	91 #include "lo-mappers.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2900 diff changeset	92
16154 aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment. John W. Eaton <jwe@octave.org> parents: 16150 diff changeset	93 // 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	94 // 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	95 // 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	96 // 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	97 // times.
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	98
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	99 #include "Cell.h"
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	100 #include "comment-list.h"
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2167 diff changeset	101 #include "defun.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	102 #include "error.h"
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	103 #include "gripes.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1341 diff changeset	104 #include "input.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	105 #include "lex.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	106 #include "ov.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	107 #include "parse.h"
2987 ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe] jwe parents: 2982 diff changeset	108 #include "pt-all.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	109 #include "symtab.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	110 #include "token.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	111 #include "toplev.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	112 #include "utils.h"
94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	113 #include "variables.h"
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9476 diff changeset	114 #include <oct-parse.h>
2492 06595bc7f2d0 [project @ 1996-11-09 00:13:50 by jwe] jwe parents: 2375 diff changeset	115 #include <oct-gperf.h>
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	116
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	117 // 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	118 // 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	119 // 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	120 // 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	121 // 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	122 // in the generated oct-parse.h file.
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	123
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	124 #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	125 #define YYSTYPE OCTAVE_STYPE
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	126 #endif
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	127
10426 4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	128 #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	129 // 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	130 // 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	131 // 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	132 #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	133 #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	134 #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	135 #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	136 #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	137 #endif
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	138
2716 2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	139 #if ! (defined (FLEX_SCANNER) \
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	140 && defined (YY_FLEX_MAJOR_VERSION) && YY_FLEX_MAJOR_VERSION >= 2 \
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	141 && defined (YY_FLEX_MINOR_VERSION) && YY_FLEX_MINOR_VERSION >= 5)
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	142 #error lex.l requires flex version 2.5.4 or later
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	143 #endif
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	144
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	145 #define YY_EXTRA_TYPE octave_base_lexer *
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	146 #define curr_lexer yyextra
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	147
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	148 // Arrange to get input via readline.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	149
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	150 #ifdef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	151 #undef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	152 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	153 #define YY_INPUT(buf, result, max_size) \
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	154 result = curr_lexer->fill_flex_buffer (buf, max_size)
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	155
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	156 // Try to avoid crashing out completely on fatal scanner errors.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	157
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	158 #ifdef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	159 #undef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	160 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	161 #define YY_FATAL_ERROR(msg) \
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	162 (yyget_extra (yyscanner))->fatal_error (msg)
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	163
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	164 #define CMD_OR_OP(PATTERN, TOK, COMPAT) \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	165 \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	166 do \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	167 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	168 curr_lexer->lexer_debug (PATTERN); \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	169 \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	170 if (curr_lexer->looks_like_command_arg ()) \
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 yyless (0); \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	173 curr_lexer->push_start_state (COMMAND_START); \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	174 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	175 else \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	176 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	177 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	178 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	179 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	180 while (0)
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	181
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	182 #define CMD_OR_COMPUTED_ASSIGN_OP(PATTERN, TOK) \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	183 \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	184 do \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	185 { \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	186 curr_lexer->lexer_debug (PATTERN); \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	187 \
19285 a3eead909bf9 fix error with command parsing (bug #43470) John W. Eaton <jwe@octave.org> parents: 18975 diff changeset	188 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	189 && curr_lexer->space_follows_previous_token ()) \
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	190 { \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	191 yyless (0); \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	192 curr_lexer->push_start_state (COMMAND_START); \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	193 } \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	194 else \
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	195 { \
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	196 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	197 false); \
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	198 } \
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 while (0)
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	201
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	202 #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	203 \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	204 do \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	205 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	206 curr_lexer->lexer_debug (PATTERN); \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	207 \
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	208 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	209 { \
16788 f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	210 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	211 { \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	212 yyless (0); \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	213 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	214 } \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	215 else \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	216 { \
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	217 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	218 } \
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	219 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	220 else \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	221 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	222 int tok \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	223 = (COMPAT \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	224 ? curr_lexer->handle_unary_op (TOK) \
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	225 : 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	226 \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	227 if (tok < 0) \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	228 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	229 yyless (0); \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	230 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	231 /* 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	232 curr_lexer->current_input_column--; \
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	233 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	234 else \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	235 { \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	236 return tok; \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	237 } \
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	238 } \
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 while (0)
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	241
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	242 // 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	243 // 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	244 // 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	245 // 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	246 // 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	247 // the current buffer.
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	248 #define HANDLE_STRING_CONTINUATION \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	249 do \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	250 { \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	251 curr_lexer->decrement_promptflag (); \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	252 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	253 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	254 \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	255 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	256 { \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	257 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	258 return -1; \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	259 \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	260 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	261 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	262 } \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	263 } \
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	264 while (0)
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	265
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	266 // 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	267 // 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	268 // candidate for a function call.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	269
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	270 #define COMMAND_ARG_FINISH \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	271 do \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	272 { \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	273 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	274 break; \
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 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	277 SQ_STRING); \
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 curr_lexer->string_text = ""; \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	280 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	281 \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	282 yyless (0); \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	283 \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	284 return retval; \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	285 } \
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	286 while (0)
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	287
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	288 #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	289 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	290 { \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	291 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	292 \
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	293 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	294 \
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 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	296 && 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	297 && ! (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	298 \|\| 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	299 { \
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 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	301 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	302 } \
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 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	304 { \
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 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	306 && 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	307 { \
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 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	309 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	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 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	312 { \
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 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	314 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	315 \
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 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	317 \
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 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	319 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	320 } \
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 } \
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 while (0)
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	324
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	325 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	326
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	327 static unsigned int Vtoken_count = 0;
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	328
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	329 // Internal variable for lexer debugging state.
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	330 static bool lexer_debug_flag = false;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	331
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	332 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	333
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	334 D [0-9]
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	335 D_ [0-9_]
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	336 S [ \t]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	337 NL ((\n)\|(\r)\|(\r\n))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	338 Im [iIjJ]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	339 CCHAR [#%]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	340 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	341 FQIDENT ({IDENT}(\.{IDENT})*)
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	342 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	343 NUMBIN (0[bB][01_]+)
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	344 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	345 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	346 NUMBER ({NUMREAL}\|{NUMHEX}\|{NUMBIN})
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	347
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	348 ANY_EXCEPT_NL [^\r\n]
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	349 ANY_INCLUDING_NL (.\|{NL})
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	350
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	351 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	352
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	353 %{
20835 14cd86258b3d use 'invalid' instead of 'bogus' in source files John W. Eaton <jwe@octave.org> parents: 20812 diff changeset	354 // 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	355 // the parser go down a special path.
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	356 %}
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	357
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	358 <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	359 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	360
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	361 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	362
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	363 // 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	364 // as the first token.
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	365 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	366
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	367 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	368
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	369 return curr_lexer->show_token (INPUT_FILE);
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	370 }
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	371
18774 4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	372 <INPUT_FILE_START><<EOF>> {
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	373 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	374
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	375 // 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	376 // as the first token.
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	377 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	378
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	379 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	380
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	381 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	382 }
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	383
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	384 %{
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	385 // Help and other command-style functions.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	386 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	387
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	388 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	389 // 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	390 // 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	391 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	392
18312 7ac2a8b758fc maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18247 18311 diff changeset	393 <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	394 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	395
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	396 COMMAND_ARG_FINISH;
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 curr_lexer->input_line_number++;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	399 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	400
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	401 HANDLE_STRING_CONTINUATION;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	402 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	403
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	404 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	405 // Commands normally end at the end of a line or a semicolon.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	406 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	407
18312 7ac2a8b758fc maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18247 18311 diff changeset	408 <COMMAND_START>({CCHAR}{ANY_EXCEPT_NL}*)?{NL} {
7ac2a8b758fc maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18247 18311 diff changeset	409 curr_lexer->lexer_debug ("<COMMAND_START>({CCHAR}{ANY_EXCEPT_NL}*)?{NL}");
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	410
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	411 COMMAND_ARG_FINISH;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	412
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	413 curr_lexer->input_line_number++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	414 curr_lexer->current_input_column = 1;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	415 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	416 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	417 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	418
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	419 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	420 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	421
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	422 <COMMAND_START>[\,\;] {
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	423 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	424
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	425 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	426 {
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	427 COMMAND_ARG_FINISH;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	428 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	429 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	430 curr_lexer->pop_start_state ();
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	431 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	432 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	433 else
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	434 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	435
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	436 curr_lexer->current_input_column += yyleng;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	437 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	438
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	439 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	440 // 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	441 // 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	442 // 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	443 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	444
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	445 <COMMAND_START>[\(\[\{]* {
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	446 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	447
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	448 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	449 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	450 curr_lexer->current_input_column += yyleng;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	451 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	452
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	453 <COMMAND_START>[\)\]\}]* {
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	454 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	455
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	456 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	457 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	458 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	459 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	460
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	461 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	462 // 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	463 // 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	464 // text. For instance,
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 // command 'text1'"text2"
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 // 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	469 // 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	470 // 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	471 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	472
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	473 <COMMAND_START>[\"\'] {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	474 curr_lexer->lexer_debug ("<COMMAND_START>[\\\"\\']");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	475
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	476 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	477 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	478 ? 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	479 else
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	480 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	481
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	482 curr_lexer->current_input_column += yyleng;
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	483 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	484
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	485 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	486 // 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	487 // 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	488 // incorporated into the argument.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	489 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	490
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	491 <COMMAND_START>{S}* {
af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	492 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	493
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	494 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	495 COMMAND_ARG_FINISH;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	496 else
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	497 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	498
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	499 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	500 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	501
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	502 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	503 // 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	504 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	505
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	506 <COMMAND_START>([\.]\|[^#% \t\r\n\.\,\;\"\'$\[\{\}\]$]*) {
18458 ebb878596bcf Restore escaped backslashes accidentally deleted by cset af8a70d6885c Mike Miller <mtmiller@ieee.org> parents: 18437 diff changeset	507 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	508
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	509 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	510 curr_lexer->current_input_column += yyleng;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	511 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	512
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	513 <MATRIX_START>{S}* {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	514 curr_lexer->lexer_debug ("<MATRIX_START>{S}*");
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	515
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	516 curr_lexer->mark_previous_token_trailing_space ();
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	517 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	518
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	519 <MATRIX_START>{NL} {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	520 curr_lexer->lexer_debug ("<MATRIX_START>{NL}");
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	521
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	522 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	523 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	524
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	525 if (curr_lexer->nesting_level.is_paren ())
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	526 curr_lexer->gripe_language_extension ("bare newline inside parentheses");
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	527 else
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	528 {
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	529 int tok = curr_lexer->previous_token_value ();
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	530
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	531 if (! (tok == ';' \|\| tok == '[' \|\| tok == '{'))
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	532 {
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	533 curr_lexer->xunput (';');
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	534 // Adjust for semicolon that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	535 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	536 }
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	537 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	538 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	539
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	540 %{
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	541 // For this and the next two rules, we're looking at ']', and we
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	542 // need to know if the next token is '=' or '=='.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	543 //
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	544 // It would have been so much easier if the delimiters were simply
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	545 // different for the expression on the left hand side of the equals
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	546 // operator.
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	547 //
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	548 // It's also a pain in the ass to decide whether to insert a comma
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	549 // after seeing a ']' character...
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	550
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17744 diff changeset	551 // FIXME: we need to handle block comments here.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	552 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	553
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	554 <MATRIX_START>\] {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	555 curr_lexer->lexer_debug ("<MATRIX_START>\\]");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	556
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	557 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	558
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	559 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	560 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	561
16299 c40a8873c2e7 eliminate some unused variables John W. Eaton <jwe@octave.org> parents: 16294 diff changeset	562 curr_lexer->handle_close_bracket (']');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	563
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	564 return curr_lexer->count_token (']');
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	565 }
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	566
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	567 %{
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17744 diff changeset	568 // 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	569 %}
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	570
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	571 <MATRIX_START>\} {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	572 curr_lexer->lexer_debug ("<MATRIX_START>\\}*");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	573
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	574 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	575
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	576 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	577 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	578
16299 c40a8873c2e7 eliminate some unused variables John W. Eaton <jwe@octave.org> parents: 16294 diff changeset	579 curr_lexer->handle_close_bracket ('}');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	580
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	581 return curr_lexer->count_token ('}');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	582 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	583
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	584 \[ {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	585 curr_lexer->lexer_debug ("\\[");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	586
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	587 bool unput_comma = false;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	588
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	589 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	590 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	591 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	592 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	593
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	594 if (! (tok == '[' \|\| tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	595 \|\| curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	596 unput_comma = true;
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
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	599 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	600 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	601 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	602 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	603 // 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	604 curr_lexer->current_input_column--;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	605 }
5615 d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe] jwe parents: 5570 diff changeset	606 else
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	607 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	608 curr_lexer->nesting_level.bracket ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	609
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	610 curr_lexer->looking_at_object_index.push_front (false);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	611
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	612 curr_lexer->current_input_column += yyleng;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	613 curr_lexer->looking_for_object_index = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	614 curr_lexer->at_beginning_of_statement = false;
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 if (curr_lexer->defining_func
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	617 && ! curr_lexer->parsed_function_name.top ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	618 curr_lexer->looking_at_return_list = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	619 else
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	620 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	621
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	622 curr_lexer->decrement_promptflag ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	623
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	624 curr_lexer->bracketflag++;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	625
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	626 curr_lexer->push_start_state (MATRIX_START);
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 return curr_lexer->count_token ('[');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	629 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	630 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	631
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	632 \] {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	633 curr_lexer->lexer_debug ("\\]");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	634
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	635 curr_lexer->nesting_level.remove ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	636
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	637 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	638
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	639 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	640 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	641
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	642 return curr_lexer->handle_token (']');
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	643 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	644
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	645 %{
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	646 // Gobble comments.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	647 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	648
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	649 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	650 // 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	651 // 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	652 // block.
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 ^{S}{CCHAR}\{{S}{NL} {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	656 curr_lexer->lexer_debug ("^{S}{CCHAR}\\{{S}{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	657
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	658 yyless (0);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	659
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	660 if (curr_lexer->start_state () == LINE_COMMENT_START)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	661 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	662 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	663 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	664
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	665 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	666 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	667
16365 8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	668 curr_lexer->decrement_promptflag ();
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	669
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	670 curr_lexer->push_start_state (BLOCK_COMMENT_START);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	671
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
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	674 <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	675 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	676
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	677 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	678 curr_lexer->current_input_column = 1;
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 if (curr_lexer->block_comment_nesting_level)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	681 curr_lexer->comment_text = "\n";
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->block_comment_nesting_level++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	684 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	685
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	686 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	687 // 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	688 // 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	689 // before storing the comment.
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 <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	693 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	694
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	695 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	696 curr_lexer->current_input_column = 1;
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 if (curr_lexer->block_comment_nesting_level > 1)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	699 curr_lexer->comment_text = "\n";
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	700 else
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	701 curr_lexer->finish_comment (octave_comment_elt::block);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	702
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	703 curr_lexer->block_comment_nesting_level--;
16364 1e064963c90a properly recognize nested block comments John W. Eaton <jwe@octave.org> parents: 16363 diff changeset	704
1e064963c90a properly recognize nested block comments John W. Eaton <jwe@octave.org> parents: 16363 diff changeset	705 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	706 {
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	707 curr_lexer->increment_promptflag ();
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	708
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	709 curr_lexer->pop_start_state ();
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	710 }
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	711 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	712
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	713 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	714 // Body of a block comment.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	715 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	716
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	717 <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	718 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	719
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	720 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	721 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	722 curr_lexer->comment_text += yytext;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	723 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	724
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 // Full-line or end-of-line comment.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	727 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	728
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	729 {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	730 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	731
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	732 curr_lexer->push_start_state (LINE_COMMENT_START);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	733 yyless (0);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	734 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	735
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	736 <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	737 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	738
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	739 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	740 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	741 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	742
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	743 bool have_space = false;
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	744 size_t len = yyleng;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	745 size_t i = 0;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	746 while (i < len)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	747 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	748 char c = yytext[i];
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	749 if (c == ' ' \|\| c == '\t')
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	750 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	751 have_space = true;
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	752 i++;
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	753 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	754 else
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	755 break;
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
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	758 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	759
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	760 while (i < len)
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	761 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	762 char c = yytext[i];
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	763 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	764 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	765 num_comment_chars++;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	766 i++;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	767 }
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	768 else
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	769 break;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	770 }
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	771
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	772 curr_lexer->comment_text += &yytext[i];
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	773
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	774 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	775 {
17882 cf3f828f401c only allow [%#]{ as block comment start (bug #40513) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	776 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	777 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	778 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	779
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	780 while (i < len)
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	781 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	782 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	783 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	784 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	785 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	786 break;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	787 }
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	788 }
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	789
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	790 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	791 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	792 yyless (0);
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	793
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	794 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	795
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	796 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	797 }
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	798 }
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 else
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	801 {
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	802 if (have_space)
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	803 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	804
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	805 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	806
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	807 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	808
6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549) John W. Eaton <jwe@octave.org> parents: 16334 diff changeset	809 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	810 curr_lexer->input_line_number--;
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	811 }
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
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	814 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	815 // End of a block of full-line comments.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	816 %}
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 <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	819 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	820
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	821 curr_lexer->xunput (yytext[0]);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	822
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	823 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	824
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	825 curr_lexer->pop_start_state ();
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
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	828 %{
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	829 // 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	830 %}
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	831
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	832 <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	833 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	834
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 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	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 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	838 }
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
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 %{
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	841 // Double-quoted character strings.
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	842 %}
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	843
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	844 <DQ_STRING_START>\"\" {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	845 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	846
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	847 curr_lexer->current_input_column += yyleng;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	848 curr_lexer->string_text += '"';
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
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	851 <DQ_STRING_START>\" {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	852 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	853
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	854 curr_lexer->current_input_column++;
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	855
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	856 curr_lexer->pop_start_state ();
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	857
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	858 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	859 {
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	860 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	861 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	862
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	863 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	864 curr_lexer->string_text,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	865 curr_lexer->string_line,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	866 curr_lexer->string_column));
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	867
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	868 curr_lexer->string_text = "";
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	869
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	870 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	871 }
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	872 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	873
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	874 <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	875 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	876
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	877 curr_lexer->current_input_column += yyleng;
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	878
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	879 int result;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	880 sscanf (yytext+1, "%o", &result);
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	881
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	882 if (result > 0xff)
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	883 error ("invalid octal escape sequence in character string");
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	884 else
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	885 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	886 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	887
17244 9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	888 <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	889 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	890
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	891 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	892
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	893 int result;
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	894 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	895
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	896 // 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	897 // 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	898 // 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	899 // 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	900 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	901 }
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	902
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	903 <DQ_STRING_START>"\\a" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	904 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	905
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	906 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	907 curr_lexer->string_text += '\a';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	908 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	909
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	910 <DQ_STRING_START>"\\b" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	911 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	912
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	913 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	914 curr_lexer->string_text += '\b';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	915 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	916
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	917 <DQ_STRING_START>"\\f" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	918 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	919
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	920 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	921 curr_lexer->string_text += '\f';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	922 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	923
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	924 <DQ_STRING_START>"\\n" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	925 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	926
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	927 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	928 curr_lexer->string_text += '\n';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	929 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	930
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	931 <DQ_STRING_START>"\\r" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	932 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	933
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	934 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	935 curr_lexer->string_text += '\r';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	936 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	937
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	938 <DQ_STRING_START>"\\t" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	939 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	940
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	941 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	942 curr_lexer->string_text += '\t';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	943 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	944
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	945 <DQ_STRING_START>"\\v" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	946 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	947
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	948 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	949 curr_lexer->string_text += '\v';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	950 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	951
18428 4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415). Stefan Mahr <dac922@gmx.de> parents: 18319 diff changeset	952 <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	953 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	954
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	955 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	956
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	957 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	958
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	959 if (nm.empty ())
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	960 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	961 else
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	962 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	963 "%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	964 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	965
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	966 HANDLE_STRING_CONTINUATION;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	967 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	968
18428 4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415). Stefan Mahr <dac922@gmx.de> parents: 18319 diff changeset	969 <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	970 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	971
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	972 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	973
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	974 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	975
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	976 if (nm.empty ())
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	977 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	978 else
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	979 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	980 "%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	981 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	982
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	983 HANDLE_STRING_CONTINUATION;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	984 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	985
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	986 <DQ_STRING_START>\\{NL} {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	987 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	988
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	989 HANDLE_STRING_CONTINUATION;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	990 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	991
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	992 <DQ_STRING_START>\\. {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	993 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	994
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	995 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	996 curr_lexer->string_text += yytext[1];
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	997 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	998
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	999 <DQ_STRING_START>\. {
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1000 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	1001
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1002 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	1003 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	1004 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1005
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1006 <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	1007 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	1008
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1009 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	1010 curr_lexer->string_text += yytext;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1011 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1012
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1013 <DQ_STRING_START>{NL} {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1014 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	1015
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1016 curr_lexer->input_line_number++;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1017 curr_lexer->current_input_column = 1;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1018
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1019 error ("unterminated character string constant");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1020
20957 9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20895 diff changeset	1021 // FIXME: This is no longer reachable now that error is exception based.
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1022 return LEXICAL_ERROR;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1023 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1024
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1025 %{
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1026 // Single-quoted character strings.
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
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1029 <SQ_STRING_START>\'\' {
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1030 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	1031
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1032 curr_lexer->current_input_column += yyleng;
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1033 curr_lexer->string_text += '\'';
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1034 }
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1035
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1036 <SQ_STRING_START>\' {
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1037 curr_lexer->lexer_debug ("<SQ_STRING_START>\\'");
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1038
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1039 curr_lexer->current_input_column++;
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1040
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1041 curr_lexer->pop_start_state ();
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1042
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1043 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	1044 {
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1045 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	1046 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	1047
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1048 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	1049 curr_lexer->string_text,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1050 curr_lexer->string_line,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1051 curr_lexer->string_column));
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1052
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1053 curr_lexer->string_text = "";
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1054
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1055 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	1056 }
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1057 }
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 <SQ_STRING_START>[^\'\n\r]+ {
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1060 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	1061
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1062 curr_lexer->current_input_column += yyleng;
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1063 curr_lexer->string_text += yytext;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1064 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1065
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1066 <SQ_STRING_START>{NL} {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1067 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	1068
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1069 curr_lexer->input_line_number++;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1070 curr_lexer->current_input_column = 1;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1071
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1072 error ("unterminated character string constant");
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1073
20957 9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20895 diff changeset	1074 // FIXME: This is no longer reachable now that error is exception based.
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1075 return LEXICAL_ERROR;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1076 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1077
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1078 %{
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1079 // Fully-qualified identifiers (used for classdef).
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1080 %}
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1081
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1082 <FQ_IDENT_START>{FQIDENT} {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1083 curr_lexer->lexer_debug ("<FQ_IDENT_START>{FQIDENT}");
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1084 curr_lexer->pop_start_state ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1085
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1086 int id_tok = curr_lexer->handle_fq_identifier ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1087
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1088 if (id_tok >= 0)
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1089 {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1090 curr_lexer->looking_for_object_index = true;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1091
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1092 return curr_lexer->count_token_internal (id_tok);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1093 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1094 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1095
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1096 <FQ_IDENT_START>{S}+ {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1097 curr_lexer->current_input_column += yyleng;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1098
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1099 curr_lexer->mark_previous_token_trailing_space ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1100 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1101
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1102 <FQ_IDENT_START>. {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1103 yyless (0);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1104 curr_lexer->pop_start_state ();
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
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1107 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1108 // Imaginary numbers.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1109 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1110
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1111 {NUMBER}{Im} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1112 curr_lexer->lexer_debug ("{NUMBER}{Im}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1113
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1114 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	1115 && curr_lexer->space_follows_previous_token ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1116 {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1117 yyless (0);
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1118 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	1119 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1120 else
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1121 {
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1122 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	1123
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1124 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	1125 && 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	1126 && ! (tok == '[' \|\| tok == '{'
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1127 \|\| 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	1128 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1129 yyless (0);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1130 unput (',');
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1131 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1132 else
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1133 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1134 curr_lexer->handle_number ();
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1135 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	1136 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1137 }
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1138 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1139
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1140 %{
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	1141 // 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	1142 // the constant.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1143 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1144
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	1145 {D}{D_}/\.[\/\\^\'] \|
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1146 {NUMBER} {
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	1147 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	1148
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1149 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	1150 && 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	1151 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1152 yyless (0);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1153 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	1154 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1155 else
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1156 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1157 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	1158
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1159 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	1160 && 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	1161 && ! (tok == '[' \|\| tok == '{'
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1162 \|\| 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	1163 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1164 yyless (0);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1165 unput (',');
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1166 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1167 else
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1168 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1169 curr_lexer->handle_number ();
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1170 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	1171 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1172 }
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1173 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1174
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1175 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1176 // 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	1177 // the <MATRIX_START> start state code above.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1178 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1179
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	1180 {S}+ {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1181 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	1182
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	1183 curr_lexer->mark_previous_token_trailing_space ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1184 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1185
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1186 %{
17247 e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1187 // 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	1188 %}
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1189
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	1190 \.\.\.{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	1191 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	1192
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1193 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	1194 }
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1195
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1196 %{
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1197 // Deprecated C preprocessor style continuation markers.
968 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
17246 8be8a65d3ca8 Ignore anything after the continuation marker '...' (bug #38653) Stefan Mahr <dac922@gmx.de> parents: 17244 diff changeset	1200 \\{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	1201 \\{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	1202 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	1203
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1204 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	1205
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1206 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	1207
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1208 if (nm.empty ())
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1209 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	1210 else
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1211 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	1212 "%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	1213 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	1214
6470a113eae2 correctly handle deprecated \ continuation markers John W. Eaton <jwe@octave.org> parents: 17247 diff changeset	1215 curr_lexer->handle_continuation ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1216 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1217
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1218 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1219 // End of file.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1220 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1221
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1222 <<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	1223 return curr_lexer->handle_end_of_input ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1224 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1225
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1226 %{
16259 0b5ab09dfce4 2/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16257 diff changeset	1227 // 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	1228
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1229 // 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	1230 // followed by "(".
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1231 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1232
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	1233 (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	1234 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	1235 }
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1236
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1237 {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	1238 HANDLE_IDENTIFIER ("{IDENT}", false);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1239 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1240
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1241 %{
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1242 // Superclass method identifiers.
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1243 %}
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1244
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1245 {IDENT}@{FQIDENT} {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1246 curr_lexer->lexer_debug ("{IDENT}@{FQIDENT}");
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1247
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1248 if (curr_lexer->previous_token_may_be_command ())
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1249 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1250 yyless (0);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1251 curr_lexer->push_start_state (COMMAND_START);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1252 }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1253 else
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1254 {
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1255 int id_tok = curr_lexer->handle_superclass_identifier ();
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1256
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1257 if (id_tok >= 0)
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1258 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1259 curr_lexer->looking_for_object_index = true;
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1260
16683 e1c6ad54259f maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16645 16681 diff changeset	1261 return curr_lexer->count_token_internal (id_tok);
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1262 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1263 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1264 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1265
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1266 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1267 // Metaclass query
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1268 %}
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1269
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1270 \?{FQIDENT} {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1271 curr_lexer->lexer_debug ("\\?{FQIDENT}");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1272
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1273 if (curr_lexer->previous_token_may_be_command ()
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1274 && curr_lexer->space_follows_previous_token ())
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1275 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1276 yyless (0);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1277 curr_lexer->push_start_state (COMMAND_START);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1278 }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1279 else
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1280 {
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1281 int id_tok = curr_lexer->handle_meta_identifier ();
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 if (id_tok >= 0)
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1284 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1285 curr_lexer->looking_for_object_index = true;
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1286
16683 e1c6ad54259f maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16645 16681 diff changeset	1287 return curr_lexer->count_token_internal (id_tok);
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1288 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1289 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1290 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1291
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	1292 "@" {
18492 e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1293 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	1294
16334 06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1295 if (curr_lexer->previous_token_may_be_command ()
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1296 && curr_lexer->space_follows_previous_token ())
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1297 {
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1298 yyless (0);
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1299 curr_lexer->push_start_state (COMMAND_START);
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1300 }
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1301 else
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1302 {
18492 e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1303 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	1304
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1305 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	1306 && 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	1307 && ! (tok == '[' \|\| tok == '{'
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1308 \|\| 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	1309 {
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1310 yyless (0);
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1311 unput (',');
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1312 }
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1313 else
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1314 {
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1315 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	1316
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->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	1318 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	1319 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	1320
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1321 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	1322 }
16334 06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1323 }
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	1324 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	1325
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	1326 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1327 // 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	1328 // 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	1329 // 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	1330 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1331
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1332 {NL} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1333 curr_lexer->lexer_debug ("{NL}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1334
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1335 curr_lexer->input_line_number++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1336 curr_lexer->current_input_column = 1;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1337
16309 e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1338 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	1339 {
e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1340 curr_lexer->at_beginning_of_statement = false;
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	1341 curr_lexer->gripe_language_extension
16309 e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1342 ("bare newline inside parentheses");
e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1343 }
e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1344 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	1345 \|\| 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	1346 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1347 curr_lexer->at_beginning_of_statement = true;
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1348 return curr_lexer->count_token ('\n');
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	1349 }
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1350 else if (curr_lexer->nesting_level.is_bracket_or_brace ())
985 4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	1351 return LEXICAL_ERROR;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1352 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1353
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 // 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	1356 // operator.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1357 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1358
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1359 "'" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1360 curr_lexer->lexer_debug ("'");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1361
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1362 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	1363 && curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1364 {
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1365 curr_lexer->current_input_column++;
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1366 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	1367 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	1368 }
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16680 diff changeset	1369 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	1370 {
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16680 diff changeset	1371 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1372 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	1373 }
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1374 else
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1375 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1376 int tok = curr_lexer->previous_token_value ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1377
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1378 if (curr_lexer->whitespace_is_significant ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1379 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1380 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	1381 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1382 if (tok == '[' \|\| tok == '{'
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1383 \|\| curr_lexer->previous_token_is_binop ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1384 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1385 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1386 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	1387 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1388 else
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1389 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1390 yyless (0);
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1391 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	1392 // 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	1393 curr_lexer->current_input_column--;
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1394 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1395 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1396 else
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1397 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1398 if (tok == '[' \|\| tok == '{'
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1399 \|\| curr_lexer->previous_token_is_binop ()
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1400 \|\| curr_lexer->previous_token_is_keyword ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1401 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1402 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1403 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	1404 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1405 else
16284 09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. John W. Eaton <jwe@octave.org> parents: 16283 diff changeset	1406 return curr_lexer->count_token (HERMITIAN);
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1407 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1408 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1409 else
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1410 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1411 if (! tok \|\| tok == '[' \|\| tok == '{' \|\| tok == '('
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1412 \|\| curr_lexer->previous_token_is_binop ()
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1413 \|\| curr_lexer->previous_token_is_keyword ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1414 {
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1415 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1416 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	1417 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1418 else
16284 09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. John W. Eaton <jwe@octave.org> parents: 16283 diff changeset	1419 return curr_lexer->count_token (HERMITIAN);
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1420 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1421 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1422 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1423
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1424 %{
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1425 // Double quotes always begin strings.
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1426 %}
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1427
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	1428 \" {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1429 curr_lexer->lexer_debug ("\\\"");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1430
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1431 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	1432 && curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1433 {
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1434 curr_lexer->current_input_column++;
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1435 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	1436 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	1437 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1438 else
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1439 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1440 int tok = curr_lexer->previous_token_value ();
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 if (curr_lexer->whitespace_is_significant ())
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1443 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1444 if (curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1445 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1446 if (tok == '[' \|\| tok == '{'
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1447 \|\| curr_lexer->previous_token_is_binop ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1448 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1449 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1450 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	1451 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1452 else
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1453 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1454 yyless (0);
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1455 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	1456 // 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	1457 curr_lexer->current_input_column--;
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1458 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1459 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1460 else
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1461 {
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1462 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1463 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	1464 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1465 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1466 else
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1467 {
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1468 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1469 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	1470 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1471 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1472 }
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1473
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1474 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1475 // Other operators.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1476 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1477
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1478 ":" { CMD_OR_OP (":", ':', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1479 ".+" { CMD_OR_OP (".+", EPLUS, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1480 ".-" { CMD_OR_OP (".-", EMINUS, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1481 "." { CMD_OR_OP (".", EMUL, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1482 "./" { CMD_OR_OP ("./", EDIV, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1483 ".\\" { CMD_OR_OP (".\\", ELEFTDIV, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1484 ".^" { CMD_OR_OP (".^", EPOW, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1485 "." { CMD_OR_OP (".", EPOW, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1486 "<=" { CMD_OR_OP ("<=", EXPR_LE, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1487 "==" { CMD_OR_OP ("==", EXPR_EQ, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1488 "~=" { CMD_OR_OP ("~=", EXPR_NE, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1489 "!=" { CMD_OR_OP ("!=", EXPR_NE, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1490 ">=" { CMD_OR_OP (">=", EXPR_GE, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1491 "&" { CMD_OR_OP ("&", EXPR_AND, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1492 "\|" { CMD_OR_OP ("\|", EXPR_OR, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1493 "<" { CMD_OR_OP ("<", EXPR_LT, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1494 ">" { CMD_OR_OP (">", EXPR_GT, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1495 "" { CMD_OR_OP ("", '*', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1496 "/" { CMD_OR_OP ("/", '/', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1497
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 // In Matlab, '\' may also trigger command syntax.
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1500 %}
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1501
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1502 "\\" { return curr_lexer->handle_op ("\\", LEFTDIV); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1503
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1504 "^" { CMD_OR_OP ("^", POW, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1505 "" { CMD_OR_OP ("", POW, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1506 "&&" { CMD_OR_OP ("&&", EXPR_AND_AND, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1507 "\|\|" { CMD_OR_OP ("\|\|", EXPR_OR_OR, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1508 "<<" { CMD_OR_OP ("<<", LSHIFT, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1509 ">>" { CMD_OR_OP (">>", RSHIFT, false); }
16265 71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1510
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1511 ";" {
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1512 bool at_beginning_of_statement
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1513 = (! (curr_lexer->whitespace_is_significant ()
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1514 \|\| curr_lexer->looking_at_object_index.front ()));
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1515
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1516 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	1517 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1518
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1519 "+" { CMD_OR_UNARY_OP ("+", '+', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1520 "-" { CMD_OR_UNARY_OP ("-", '-', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1521
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1522 "~" { CMD_OR_UNARY_OP ("~", EXPR_NOT, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1523 "!" { 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	1524
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1525 "," {
16265 71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1526 bool at_beginning_of_statement
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1527 = (! (curr_lexer->whitespace_is_significant ()
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1528 \|\| curr_lexer->looking_at_object_index.front ()));
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1529
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1530 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	1531 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1532
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1533 ".'" {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1534 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	1535 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1536
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1537 "++" { CMD_OR_UNARY_OP ("++", PLUS_PLUS, false); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1538 "--" { CMD_OR_UNARY_OP ("--", MINUS_MINUS, false); }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1539
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1540 "(" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1541 curr_lexer->lexer_debug ("(");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1542
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1543 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1544
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1545 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1546 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1547 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1548 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1549
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1550 if (! (tok == '[' \|\| tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1551 \|\| curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1552 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1553 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1554
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1555 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1556 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1557 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1558 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	1559 // 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	1560 curr_lexer->current_input_column--;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1561 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1562 else
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1563 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1564 // 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	1565 // 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	1566 // 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	1567 // the matching close paren).
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1568
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1569 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	1570 (curr_lexer->looking_for_object_index);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1571
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1572 curr_lexer->looking_at_indirect_ref = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1573 curr_lexer->looking_for_object_index = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1574 curr_lexer->at_beginning_of_statement = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1575
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1576 curr_lexer->nesting_level.paren ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1577 curr_lexer->decrement_promptflag ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1578
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1579 return curr_lexer->handle_token ('(');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1580 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1581 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1582
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1583 ")" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1584 curr_lexer->lexer_debug (")");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1585
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1586 curr_lexer->nesting_level.remove ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1587 curr_lexer->current_input_column++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1588
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1589 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	1590
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1591 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	1592 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	1593
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1594 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	1595 {
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1596 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	1597 curr_lexer->nesting_level.anon_fcn_body ();
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1598 }
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 12801 diff changeset	1599
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1600 return curr_lexer->count_token (')');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1601 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1602
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1603 "." {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1604 curr_lexer->lexer_debug (".");
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1605
16325 fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1606 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	1607 && curr_lexer->space_follows_previous_token ())
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1608 {
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1609 yyless (0);
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1610 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	1611 }
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1612 else
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1613 {
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1614 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	1615 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	1616
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1617 return curr_lexer->handle_token ('.');
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1618 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1619 }
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1620
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1621 %{
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1622 // = and op= operators.
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1623 %}
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1624
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1625 "=" {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1626 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	1627
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1628 return curr_lexer->handle_op ("=", '=');
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1629 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1630
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1631 "+=" { CMD_OR_COMPUTED_ASSIGN_OP ("+=", ADD_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1632 "-=" { CMD_OR_COMPUTED_ASSIGN_OP ("-=", SUB_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1633 "=" { CMD_OR_COMPUTED_ASSIGN_OP ("=", MUL_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1634 "/=" { CMD_OR_COMPUTED_ASSIGN_OP ("/=", DIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1635 "\\=" { CMD_OR_COMPUTED_ASSIGN_OP ("\\=", LEFTDIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1636 ".+=" { CMD_OR_COMPUTED_ASSIGN_OP (".+=", ADD_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1637 ".-=" { CMD_OR_COMPUTED_ASSIGN_OP (".-=", SUB_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1638 ".=" { CMD_OR_COMPUTED_ASSIGN_OP (".=", EMUL_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1639 "./=" { CMD_OR_COMPUTED_ASSIGN_OP ("./=", EDIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1640 ".\\=" { CMD_OR_COMPUTED_ASSIGN_OP (".\\=", ELEFTDIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1641 "^=" { CMD_OR_COMPUTED_ASSIGN_OP ("^=", POW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1642 "**=" { CMD_OR_COMPUTED_ASSIGN_OP ("^=", POW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1643 ".^=" { CMD_OR_COMPUTED_ASSIGN_OP (".^=", EPOW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1644 ".**=" { CMD_OR_COMPUTED_ASSIGN_OP (".^=", EPOW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1645 "&=" { CMD_OR_COMPUTED_ASSIGN_OP ("&=", AND_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1646 "\|=" { CMD_OR_COMPUTED_ASSIGN_OP ("\|=", OR_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1647 "<<=" { CMD_OR_COMPUTED_ASSIGN_OP ("<<=", LSHIFT_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1648 ">>=" { CMD_OR_COMPUTED_ASSIGN_OP (">>=", RSHIFT_EQ); }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1649
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1650 %{
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1651 // In Matlab, '{' may also trigger command syntax.
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1652 %}
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1653
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1654 "{" {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1655 curr_lexer->lexer_debug ("{");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1656
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1657 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1658
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1659 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1660 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1661 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1662 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1663
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1664 if (! (tok == '[' \|\| tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1665 \|\| curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1666 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1667 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1668
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1669 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1670 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1671 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1672 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	1673 // 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	1674 curr_lexer->current_input_column--;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1675 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1676 else
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1677 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1678 curr_lexer->nesting_level.brace ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1679
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1680 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	1681 (curr_lexer->looking_for_object_index);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1682
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1683 curr_lexer->current_input_column += yyleng;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1684 curr_lexer->looking_for_object_index = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1685 curr_lexer->at_beginning_of_statement = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1686
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1687 curr_lexer->decrement_promptflag ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1688
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1689 curr_lexer->braceflag++;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1690
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1691 curr_lexer->push_start_state (MATRIX_START);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1692
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1693 return curr_lexer->count_token ('{');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1694 }
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1695 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1696
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1697 "}" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1698 curr_lexer->lexer_debug ("}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1699
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1700 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	1701
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1702 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	1703 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	1704
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1705 curr_lexer->nesting_level.remove ();
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1706
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1707 return curr_lexer->handle_token ('}');
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1708 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1709
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1710 %{
2066 a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe] jwe parents: 2042 diff changeset	1711 // Unrecognized input is a lexical error.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1712 %}
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1713
2042 31f4f775b8c6 [project @ 1996-03-28 09:06:28 by jwe] jwe parents: 1994 diff changeset	1714 . {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1715 curr_lexer->lexer_debug (".");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1716
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1717 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	1718
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1719 int c = curr_lexer->text_yyinput ();
4248 eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe] jwe parents: 4241 diff changeset	1720
16294 0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1721 if (c == 1)
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1722 return -1;
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1723 else if (c == EOF)
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1724 return curr_lexer->handle_end_of_input ();
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1725 else
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	1726 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1727 curr_lexer->current_input_column++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1728
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	1729 error ("invalid character '%s' (ASCII %d) near line %d, column %d",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1730 undo_string_escape (static_cast<char> (c)), c,
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1731 curr_lexer->input_line_number, curr_lexer->current_input_column);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1732
21055 5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 21023 diff changeset	1733 // FIXME: This is no longer reachable now that error is exception based.
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1734 return LEXICAL_ERROR;
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	1735 }
2066 a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe] jwe parents: 2042 diff changeset	1736 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1737
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1738 %{
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1739 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1740 // 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	1741 #pragma GCC diagnostic push
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1742 #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	1743 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1744 %}
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1745
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1746 %{
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1747 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1748 // 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	1749 // after the pattern rules.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1750 #pragma GCC diagnostic ignored "-Wunused-parameter"
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1751 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1752 %}
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1753
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1754 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1755
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1756 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1757 // 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	1758 #pragma GCC diagnostic pop
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1759 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1760
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1761 void *
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1762 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	1763 {
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1764 return malloc (size);
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1765 }
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1766
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1767 void *
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1768 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	1769 {
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1770 return realloc (ptr, size);
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1771 }
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1772
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1773 void
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1774 octave_free (void *ptr, yyscan_t)
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1775 {
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1776 free (ptr);
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1777 }
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1778
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1779 static void
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1780 display_character (char c)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1781 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1782 if (isgraph (c))
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1783 std::cerr << c;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1784 else
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1785 switch (c)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1786 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1787 case 0:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1788 std::cerr << "NUL";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1789 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1790
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1791 case 1:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1792 std::cerr << "SOH";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1793 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1794
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1795 case 2:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1796 std::cerr << "STX";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1797 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1798
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1799 case 3:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1800 std::cerr << "ETX";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1801 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1802
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1803 case 4:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1804 std::cerr << "EOT";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1805 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1806
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1807 case 5:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1808 std::cerr << "ENQ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1809 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1810
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1811 case 6:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1812 std::cerr << "ACK";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1813 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1814
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1815 case 7:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1816 std::cerr << "\\a";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1817 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1818
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1819 case 8:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1820 std::cerr << "\\b";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1821 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1822
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1823 case 9:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1824 std::cerr << "\\t";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1825 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1826
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1827 case 10:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1828 std::cerr << "\\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1829 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1830
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1831 case 11:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1832 std::cerr << "\\v";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1833 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1834
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1835 case 12:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1836 std::cerr << "\\f";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1837 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1838
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1839 case 13:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1840 std::cerr << "\\r";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1841 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1842
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1843 case 14:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1844 std::cerr << "SO";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1845 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1846
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1847 case 15:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1848 std::cerr << "SI";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1849 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1850
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1851 case 16:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1852 std::cerr << "DLE";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1853 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1854
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1855 case 17:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1856 std::cerr << "DC1";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1857 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1858
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1859 case 18:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1860 std::cerr << "DC2";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1861 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1862
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1863 case 19:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1864 std::cerr << "DC3";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1865 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1866
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1867 case 20:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1868 std::cerr << "DC4";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1869 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1870
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1871 case 21:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1872 std::cerr << "NAK";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1873 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1874
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1875 case 22:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1876 std::cerr << "SYN";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1877 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1878
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1879 case 23:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1880 std::cerr << "ETB";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1881 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1882
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1883 case 24:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1884 std::cerr << "CAN";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1885 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1886
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1887 case 25:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1888 std::cerr << "EM";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1889 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1890
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1891 case 26:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1892 std::cerr << "SUB";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1893 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1894
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1895 case 27:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1896 std::cerr << "ESC";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1897 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1898
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1899 case 28:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1900 std::cerr << "FS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1901 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1902
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1903 case 29:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1904 std::cerr << "GS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1905 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1906
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1907 case 30:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1908 std::cerr << "RS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1909 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1910
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1911 case 31:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1912 std::cerr << "US";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1913 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1914
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1915 case 32:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1916 std::cerr << "SPACE";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1917 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1918
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1919 case 127:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1920 std::cerr << "DEL";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1921 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1922 }
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1923 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1924
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1925 bool
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1926 is_keyword (const std::string& s)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1927 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1928 // Parsing function names like "set.property_name" inside
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1929 // 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	1930 // "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	1931 // 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	1932 // the language, so omit them from the list of possible keywords.
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1933
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1934 return (octave_kw_hash::in_word_set (s.c_str (), s.length ()) != 0
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1935 && ! (s == "set" \|\| s == "get"));
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1936 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1937
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1938 DEFUN (iskeyword, args, ,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1939 "-- texinfo --\n\
20895 7697a3433e37 doc: Remove class of function from docstring from generated C++ files. Rik <rik@octave.org> parents: 20835 diff changeset	1940 @deftypefn {} {} iskeyword ()\n\
7697a3433e37 doc: Remove class of function from docstring from generated C++ files. Rik <rik@octave.org> parents: 20835 diff changeset	1941 @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	1942 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	1943 \n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19859 diff changeset	1944 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	1945 @seealso{isvarname, exist}\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1946 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1947 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1948 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1949
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1950 int nargin = args.length ();
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1951
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1952 if (nargin > 1)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20773 diff changeset	1953 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20773 diff changeset	1954
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1955 if (nargin == 0)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1956 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1957 // 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	1958 // is_keyword function for additional details.
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1959
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1960 string_vector lst (TOTAL_KEYWORDS);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1961
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1962 int j = 0;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1963
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1964 for (int i = 0; i < TOTAL_KEYWORDS; i++)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1965 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1966 std::string kword = wordlist[i].name;
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1967
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1968 if (kword != "set" && kword != "get")
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1969 lst[j++] = kword;
16114 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
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1972 lst.resize (j);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1973
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1974 retval = Cell (lst.sort ());
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1975 }
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1976 else
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1977 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1978 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	1979 retval = is_keyword (name);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1980 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1981
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1982 return retval;
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 /*
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1986
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1987 %!assert (iskeyword ("for"))
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1988 %!assert (iskeyword ("fort"), false)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1989 %!assert (iskeyword ("fft"), false)
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1990 %!assert (iskeyword ("get"), false)
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1991 %!assert (iskeyword ("set"), false)
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1992
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1993 %!error iskeyword ("A", "B")
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1994 %!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	1995
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1996 */
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1997
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1998 DEFUN (__display_tokens__, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1999 "-- texinfo --\n\
20895 7697a3433e37 doc: Remove class of function from docstring from generated C++ files. Rik <rik@octave.org> parents: 20835 diff changeset	2000 @deftypefn {} {} __display_tokens__ ()\n\
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2001 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	2002 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	2003 @seealso{__lexer_debug_flag__, __token_count__}\n\
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2004 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2005 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2006 return SET_INTERNAL_VARIABLE (display_tokens);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2007 }
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 DEFUN (__token_count__, , ,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2010 "-- texinfo --\n\
20895 7697a3433e37 doc: Remove class of function from docstring from generated C++ files. Rik <rik@octave.org> parents: 20835 diff changeset	2011 @deftypefn {} {} __token_count__ ()\n\
18531 04b4fb217b1a doc: Improve documentation strings in parse-tree directory. Rik <rik@octave.org> parents: 18492 diff changeset	2012 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	2013 @seealso{__lexer_debug_flag__, __display_tokens__}\n\
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2014 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2015 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2016 return octave_value (Vtoken_count);
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 DEFUN (__lexer_debug_flag__, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2020 "-- texinfo --\n\
20895 7697a3433e37 doc: Remove class of function from docstring from generated C++ files. Rik <rik@octave.org> parents: 20835 diff changeset	2021 @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	2022 @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	2023 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	2024 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	2025 @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	2026 @end deftypefn")
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 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2029
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2030 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	2031 "__lexer_debug_flag__");
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 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2034 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2035
16193 d7392bf42fd1 use inheritance to simplify initialization in octave_lexer constructor John W. Eaton <jwe@octave.org> parents: 16183 diff changeset	2036 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	2037 {
16230 4bf907906134 use a queue to hold tokens in the lexer John W. Eaton <jwe@octave.org> parents: 16229 diff changeset	2038 tokens.clear ();
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2039 }
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2040
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2041 void
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2042 lexical_feedback::init (void)
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2043 {
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2044 // 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	2045 // index.
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2046 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	2047 }
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2048
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2049 void
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2050 lexical_feedback::reset (void)
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2051 {
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2052 end_of_input = false;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2053 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	2054 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	2055 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	2056 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	2057 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	2058 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	2059 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	2060 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	2061 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	2062 parsing_class_method = false;
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	2063 parsing_classdef = false;
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2064 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	2065 parsing_classdef_get_method = false;
3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	2066 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	2067 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	2068 force_script = false;
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	2069 reading_fcn_file = false;
810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	2070 reading_script_file = false;
810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	2071 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	2072 input_line_number = 1;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2073 current_input_column = 1;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2074 bracketflag = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2075 braceflag = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2076 looping = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2077 defining_func = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2078 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	2079 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	2080 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	2081 token_count = 0;
16207 0467d68ca891 move current_input_line to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	2082 current_input_line = "";
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2083 comment_text = "";
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2084 help_text = "";
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2085 string_text = "";
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2086 string_line = 0;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2087 string_column = 0;
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2088 fcn_file_name = "";
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2089 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	2090 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	2091 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	2092
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2093 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	2094 parsed_function_name.pop ();
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2095
20772 51ab9145f6e6 set all lexical_feedback variables in init function (bug #46522) John W. Eaton <jwe@octave.org> parents: 20188 diff changeset	2096 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	2097 symtab_context.clear ();
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2098 nesting_level.reset ();
16230 4bf907906134 use a queue to hold tokens in the lexer John W. Eaton <jwe@octave.org> parents: 16229 diff changeset	2099 tokens.clear ();
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2100 }
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2101
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2102 int
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2103 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	2104 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2105 const token *tok = tokens.front ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2106 return tok ? tok->token_value () : 0;
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2107 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2108
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2109 bool
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2110 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	2111 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2112 const token *tok = tokens.front ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2113 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	2114 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2115
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2116 void
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2117 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	2118 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2119 token *tok = tokens.front ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2120 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	2121 tok->mark_trailing_space ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2122 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2123
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2124 bool
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2125 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	2126 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2127 const token *tok = tokens.front ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2128 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	2129 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2130
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2131 bool
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2132 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	2133 {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2134 int tok = previous_token_value ();
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2135
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2136 return (tok == '+' \|\| tok == '-' \|\| tok == '@'
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2137 \|\| tok == ',' \|\| tok == ';' \|\| tok == '*' \|\| tok == '/'
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2138 \|\| tok == ':' \|\| tok == '=' \|\| tok == ADD_EQ
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2139 \|\| 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	2140 \|\| 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	2141 \|\| tok == EMINUS \|\| tok == EMUL \|\| tok == EMUL_EQ
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2142 \|\| 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	2143 \|\| 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	2144 \|\| 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	2145 \|\| 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	2146 \|\| tok == EXPR_OR_OR \|\| tok == LEFTDIV \|\| tok == LEFTDIV_EQ
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2147 \|\| tok == LSHIFT \|\| tok == LSHIFT_EQ \|\| tok == MUL_EQ
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2148 \|\| tok == OR_EQ \|\| tok == POW \|\| tok == POW_EQ
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2149 \|\| tok == RSHIFT \|\| tok == RSHIFT_EQ \|\| tok == SUB_EQ);
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2150 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2151
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2152 bool
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2153 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	2154 {
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2155 const token *tok = tokens.front ();
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2156 return tok ? tok->is_keyword () : false;
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2157 }
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2158
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2159 bool
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2160 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	2161 {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2162 const token *tok = tokens.front ();
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2163 return tok ? tok->may_be_command () : false;
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2164 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2165
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2166 void
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2167 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	2168 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2169 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	2170
d56cbc17566e avoid looking at previous token that doesn't exist (bug #39180) John W. Eaton <jwe@octave.org> parents: 16681 diff changeset	2171 if (tok && tok->is_symbol ())
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2172 pending_local_variables.insert (tok->symbol_name ());
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2173 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2174
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2175 void
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2176 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	2177 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2178 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	2179 p != lst.end (); p++)
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2180 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2181 pending_local_variables.insert (*p);
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2182 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2183 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2184
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2185 static bool
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2186 looks_like_copyright (const std::string& s)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2187 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2188 bool retval = false;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2189
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2190 if (! s.empty ())
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2191 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2192 size_t offset = s.find_first_not_of (" \t");
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2193
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2194 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	2195 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2196
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2197 return retval;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2198 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2199
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2200 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2201 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	2202 {
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	2203 buffer = input;
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2204 chars_left = buffer.length ();
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2205 pos = buffer.c_str ();
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	2206 eof = eof_arg;
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2207 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2208
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2209 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2210 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	2211 {
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2212 static const char * const eol = "\n";
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2213
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2214 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	2215 assert (len > 0);
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2216
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2217 memcpy (buf, pos, len);
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2218
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2219 chars_left -= len;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2220 pos += len;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2221
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2222 // 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	2223 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	2224 {
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2225 if (len < max_size)
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2226 {
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2227 // 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	2228 // the buffer.
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2229 buf[len++] = '\n';
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2230 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2231 else
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2232 {
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2233 // 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	2234 // 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	2235 // call to octave_base_lexer::read.
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2236 pos = eol;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2237 chars_left = 1;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2238 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2239 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2240
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2241 return len;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2242 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	2243
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2244 octave_base_lexer::~octave_base_lexer (void)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2245 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2246 yylex_destroy (scanner);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2247 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2248
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2249 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2250 octave_base_lexer::init (void)
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2251 {
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2252 yylex_init (&scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2253
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2254 // 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	2255 // flex-generated lexer.
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2256 yyset_extra (this, scanner);
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2257
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2258 clear_start_state ();
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2259 }
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2260
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2261 // 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	2262 // 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	2263 // (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	2264 // 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	2265 // OCTAVE_YYG macro.
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2266
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2267 #define OCTAVE_YYG \
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2268 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	2269
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2270 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2271 octave_base_lexer::reset (void)
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2272 {
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2273 // 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	2274 clear_start_state ();
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2275
16320 09f0cb9cac7d don't modify symbol table scope in the parser John W. Eaton <jwe@octave.org> parents: 16309 diff changeset	2276 symtab_context.clear ();
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2277
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2278 // 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	2279 promptflag (1);
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2280
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2281 // 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	2282 // input.
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2283
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2284 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	2285 && interactive
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2286 && ! (reading_fcn_file
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2287 \|\| reading_classdef_file
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2288 \|\| reading_script_file
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2289 \|\| input_from_eval_string ()))
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2290 yyrestart (stdin, scanner);
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2291
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	2292 lexical_feedback::reset ();
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17355 diff changeset	2293
efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17355 diff changeset	2294 comment_buf.reset ();
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2295 }
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	2296
16124 3be725cd195b move more lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16123 diff changeset	2297 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2298 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	2299 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2300 reading_script_file = true;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2301
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2302 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	2303 }
3be725cd195b move more lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16123 diff changeset	2304
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2305 void
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2306 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	2307 {
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2308 string_line = input_line_number;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2309 string_column = current_input_column;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2310
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2311 push_start_state (state);
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2312 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	2313
16121 bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	2314 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2315 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	2316 {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	2317 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	2318
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2319 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	2320 {
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2321 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	2322
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2323 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	2324 && ! 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	2325 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	2326 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	2327 }
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2328
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	2329 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	2330 }
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2331
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2332 char *
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2333 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	2334 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2335 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	2336 }
210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2337
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2338 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2339 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	2340 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2341 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	2342 }
421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2343
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2344 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2345 octave_base_lexer::text_yyinput (void)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2346 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2347 int c = yyinput (scanner);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2348
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2349 if (lexer_debug_flag)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2350 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2351 std::cerr << "I: ";
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2352 display_character (c);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2353 std::cerr << std::endl;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2354 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2355
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2356 // 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	2357
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2358 if (c == '\r')
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2359 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2360 c = yyinput (scanner);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2361
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2362 if (lexer_debug_flag)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2363 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2364 std::cerr << "I: ";
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2365 display_character (c);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2366 std::cerr << std::endl;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2367 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2368
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2369 if (c != '\n')
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2370 {
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2371 xunput (c);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2372 c = '\n';
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2373 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2374 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2375
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2376 return c;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2377 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2378
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2379 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2380 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	2381 {
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	2382 if (c != EOF)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2383 {
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	2384 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	2385 {
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2386 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	2387 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	2388 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	2389 }
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2390
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	2391 yyunput (c, buf, scanner);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2392 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2393 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2394
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2395 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2396 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	2397 {
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2398 char *yytxt = flex_yytext ();
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	2399
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2400 xunput (c, yytxt);
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2401 }
96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2402
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2403 bool
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2404 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	2405 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2406 int c = text_yyinput ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2407 xunput (c);
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2408 return (c == ' ' \|\| c == '\t');
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2409 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2410
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2411 bool
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2412 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	2413 {
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2414 bool retval = false;
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2415
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2416 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	2417 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	2418 {
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2419 if (*i)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2420 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2421 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2422 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2423 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2424 }
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2425
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2426 return retval;
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2427 }
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2428
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2429 bool
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2430 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	2431 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2432 return (symbol_table::is_variable (name)
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2433 \|\| (pending_local_variables.find (name)
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2434 != pending_local_variables.end ()));
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2435 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2436
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	2437 // 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	2438
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2439 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2440 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	2441 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2442 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	2443 int c = current_input_column;
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: 3802 diff changeset	2444
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	2445 int len = s.length ();
922 708827b941b4 [project @ 1994-11-14 22:14:13 by jwe] jwe parents: 916 diff changeset	2446
5088 7830f271a53f [project @ 2004-12-01 19:54:45 by jwe] jwe parents: 5035 diff changeset	2447 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	2448
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2449 if (kw)
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 120 diff changeset	2450 {
18319 f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2451 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	2452
16783 0bf1d559b321 always set at_beginning_of_statement when recognizing keywords (bug #38758) John W. Eaton <jwe@octave.org> parents: 16756 diff changeset	2453 // 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	2454 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	2455
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	2456 token *tok_val = 0;
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2457
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2458 switch (kw->kw_id)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2459 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2460 case break_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2461 case catch_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2462 case continue_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2463 case else_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2464 case otherwise_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2465 case return_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2466 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	2467 at_beginning_of_statement = true;
10315 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
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	2470 case persistent_kw:
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	2471 case global_kw:
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	2472 looking_at_decl_list = true;
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	2473 break;
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	2474
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2475 case case_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2476 case elseif_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2477 case until_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2478 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2479
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2480 case end_kw:
14645 cbc00b587f36 also allow "end" indexing in classdef files John W. Eaton <jwe@octave.org> parents: 14642 diff changeset	2481 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	2482 \|\| (defining_func
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18340 diff changeset	2483 && ! (looking_at_return_list
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18340 diff changeset	2484 \|\| 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	2485 {
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2486 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	2487 return 0;
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2488 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2489
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2490 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	2491 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2492 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2493
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2494 case end_try_catch_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2495 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	2496 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2497 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2498
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2499 case end_unwind_protect_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2500 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	2501 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	2502 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2503 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2504
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2505 case endfor_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2506 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	2507 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2508 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2509
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2510 case endfunction_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2511 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	2512 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2513 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2514
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2515 case endif_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2516 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	2517 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2518 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2519
13246 0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	2520 case endparfor_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2521 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	2522 at_beginning_of_statement = true;
13246 0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	2523 break;
0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	2524
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2525 case endswitch_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2526 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	2527 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2528 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2529
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2530 case endwhile_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2531 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	2532 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2533 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2534
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2535 case endclassdef_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2536 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	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;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2539
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2540 case endenumeration_kw:
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2541 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	2542 at_beginning_of_statement = true;
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2543 break;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2544
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2545 case endevents_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 (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	2547 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2548 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2549
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2550 case endmethods_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2551 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	2552 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2553 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2554
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2555 case endproperties_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2556 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	2557 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2558 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2559
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	2560
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2561 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	2562 case parfor_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2563 case while_kw:
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	2564 decrement_promptflag ();
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2565 looping++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2566 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2567
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2568 case do_kw:
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2569 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	2570 decrement_promptflag ();
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2571 looping++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2572 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2573
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2574 case try_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2575 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	2576 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	2577 decrement_promptflag ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2578 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2579
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2580 case if_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2581 case switch_kw:
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	2582 decrement_promptflag ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2583 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2584
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2585 case get_kw:
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2586 case set_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2587 // 'get' and 'set' are keywords in classdef method
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2588 // declarations.
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2589 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	2590 {
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2591 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	2592 return 0;
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2593 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2594 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2595
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2596 case enumeration_kw:
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2597 case events_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2598 case methods_kw:
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2599 case properties_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2600 // 'properties', 'methods' and 'events' are keywords for
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2601 // classdef blocks.
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2602 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	2603 {
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2604 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	2605 return 0;
f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2606 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2607 // fall through ...
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2608
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2609 case classdef_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2610 // '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	2611 decrement_promptflag ();
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2612
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2613 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	2614 {
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2615 reading_classdef_file = true;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2616 reading_script_file = false;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2617 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2618 break;
10315 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 function_kw:
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	2621 decrement_promptflag ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2622
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2623 defining_func++;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2624 parsed_function_name.push (false);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2625
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2626 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	2627 {
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2628 reading_fcn_file = true;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2629 reading_script_file = false;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2630 }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2631
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2632 if (! (reading_fcn_file \|\| reading_script_file
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2633 \|\| reading_classdef_file))
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2634 input_line_number = 1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2635 break;
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2636
3174 390d5e396682 [project @ 1998-05-04 16:36:17 by jwe] jwe parents: 3165 diff changeset	2637 case magic_file_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2638 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2639 if ((reading_fcn_file \|\| reading_script_file
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2640 \|\| reading_classdef_file)
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2641 && ! 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	2642 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	2643 else
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2644 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	2645 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2646 break;
3174 390d5e396682 [project @ 1998-05-04 16:36:17 by jwe] jwe parents: 3165 diff changeset	2647
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe] jwe parents: 3165 diff changeset	2648 case magic_line_kw:
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2649 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	2650 "", l, c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2651 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2652
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2653 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2654 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2655 }
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2656
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	2657 if (! tok_val)
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	2658 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	2659
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	2660 push_token (tok_val);
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2661
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	2662 return kw->tok;
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 120 diff changeset	2663 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2664
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2665 return 0;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2666 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2667
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2668 bool
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2669 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	2670 {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2671 size_t p1 = 0;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2672 size_t p2;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2673
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2674 std::string s_part;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2675
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2676 do
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2677 {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2678 p2 = s.find ('.', p1);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2679
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2680 if (p2 != std::string::npos)
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2681 {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2682 s_part = s.substr (p1, p2 - p1);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2683 p1 = p2 + 1;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2684 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2685 else
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2686 s_part = s.substr (p1);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2687
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2688 if (is_keyword_token (s_part))
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2689 return true;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2690 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2691 while (p2 != std::string::npos);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2692
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2693 return false;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2694 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2695
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2696 bool
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2697 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	2698 {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2699 return (nesting_level.is_bracket ()
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2700 \|\| (nesting_level.is_brace ()
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2701 && ! looking_at_object_index.front ()));
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2702 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2703
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2704 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	2705 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	2706 {
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2707 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	2708 }
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2709
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2710 static inline bool
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2711 looks_like_hex (const char *s, int len)
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2712 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2713 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	2714 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2715
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2716 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2717 octave_base_lexer::handle_number (void)
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2718 {
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2719 double value = 0.0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2720 int nread = 0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2721
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2722 char *yytxt = flex_yytext ();
210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2723
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2724 // Strip any underscores
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2725 char *tmptxt = strsave (yytxt);
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2726 char *rptr = tmptxt;
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2727 char *wptr = tmptxt;
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2728 while (*rptr)
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2729 {
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2730 wptr = rptr++;
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2731 wptr += (*wptr != '_');
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2732 }
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2733 *wptr = '\0';
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2734
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2735 if (looks_like_hex (tmptxt, strlen (tmptxt)))
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2736 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2737 unsigned long ival;
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2738
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2739 nread = sscanf (tmptxt, "%lx", &ival);
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2740
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2741 value = static_cast<double> (ival);
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2742 }
20589 7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2743 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	2744 {
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2745 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	2746
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	2747 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	2748 {
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2749 ivalue <<= 1;
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2750 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	2751 }
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 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	2754 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	2755 }
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2756 else
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2757 {
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2758 char *idx = strpbrk (tmptxt, "Dd");
2621 337a09dd1c06 [project @ 1997-01-24 21:49:41 by jwe] jwe parents: 2614 diff changeset	2759
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2760 if (idx)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2761 *idx = 'e';
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2762
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2763 nread = sscanf (tmptxt, "%lf", &value);
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2764 }
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2765
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2766 delete [] tmptxt;
e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	2767
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	2768 // 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	2769
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2770 assert (nread == 1);
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2771
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2772 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	2773 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	2774
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2775 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	2776 current_input_column));
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2777
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2778 current_input_column += flex_yyleng ();
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2779 }
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2780
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2781 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2782 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	2783 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2784 char *yytxt = flex_yytext ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2785 int yylng = flex_yyleng ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2786
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2787 int offset = 1;
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2788 if (yytxt[0] == '\\')
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	2789 gripe_language_extension_continuation ();
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2790 else
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2791 offset = 3;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2792
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2793 bool have_space = false;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2794 while (offset < yylng)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2795 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2796 char c = yytxt[offset];
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2797 if (c == ' ' \|\| c == '\t')
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2798 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2799 have_space = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2800 offset++;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2801 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2802 else
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2803 break;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2804 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2805
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2806 if (have_space)
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2807 mark_previous_token_trailing_space ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2808
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2809 bool have_comment = false;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2810 while (offset < yylng)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2811 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2812 char c = yytxt[offset];
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2813 if (c == '#' \|\| c == '%')
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2814 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2815 have_comment = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2816 offset++;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2817 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2818 else
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2819 break;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2820 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2821
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2822 if (have_comment)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2823 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2824 comment_text = &yytxt[offset];
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2825
18246 1f072ae35ede fix parsing of single quote after continuation and comment (bug #41048) John W. Eaton <jwe@octave.org> parents: 18135 diff changeset	2826 // 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	2827 // 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	2828 // 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	2829
1f072ae35ede fix parsing of single quote after continuation and comment (bug #41048) John W. Eaton <jwe@octave.org> parents: 18135 diff changeset	2830 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	2831
16337 6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549) John W. Eaton <jwe@octave.org> parents: 16334 diff changeset	2832 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	2833
1f072ae35ede fix parsing of single quote after continuation and comment (bug #41048) John W. Eaton <jwe@octave.org> parents: 18135 diff changeset	2834 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	2835 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2836
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2837 decrement_promptflag ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2838 input_line_number++;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2839 current_input_column = 1;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2840 }
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 void
16337 6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549) John W. Eaton <jwe@octave.org> parents: 16334 diff changeset	2843 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	2844 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2845 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	2846
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2847 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	2848 && ! comment_text.empty () && ! copyright)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2849 help_text = comment_text;
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 if (copyright)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2852 typ = octave_comment_elt::copyright;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2853
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17355 diff changeset	2854 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	2855
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2856 comment_text = "";
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 at_beginning_of_statement = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2859 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2860
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2861 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2862 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	2863 {
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4608 diff changeset	2864 int retval = bracket_type;
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2865
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2866 if (! nesting_level.none ())
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2867 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2868 nesting_level.remove ();
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2869
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2870 if (bracket_type == ']')
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2871 bracketflag--;
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2872 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	2873 braceflag--;
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2874 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2875 panic_impossible ();
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2876 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2877
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2878 pop_start_state ();
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2879
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2880 return retval;
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2881 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2882
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2883 bool
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2884 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	2885 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2886 bool space_before = space_follows_previous_token ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2887 bool space_after = looking_at_space ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2888
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2889 return (space_before && ! space_after
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	2890 && previous_token_may_be_command ());
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2891 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2892
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2893 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2894 octave_base_lexer::handle_superclass_identifier (void)
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2895 {
16280 0dc6731fc0da avoid eat_continuation in classdef branch John W. Eaton <jwe@octave.org> parents: 16278 diff changeset	2896 std::string meth = flex_yytext ();
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	2897
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2898 size_t pos = meth.find ("@");
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	2899 std::string cls = meth.substr (pos + 1);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	2900 meth = meth.substr (0, pos);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2901
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2902 bool kw_token = (is_keyword_token (meth)
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2903 \|\| fq_identifier_contains_keyword (cls));
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2904
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2905 if (kw_token)
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2906 {
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	2907 error ("method, class, and package names may not be keywords");
20957 9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20895 diff changeset	2908 // FIXME: This is no longer reachable now that error is exception based.
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2909 return LEXICAL_ERROR;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2910 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2911
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2912 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	2913 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	2914
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2915 current_input_column += flex_yyleng ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2916
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2917 return SUPERCLASSREF;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2918 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2919
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2920 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2921 octave_base_lexer::handle_meta_identifier (void)
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2922 {
16280 0dc6731fc0da avoid eat_continuation in classdef branch John W. Eaton <jwe@octave.org> parents: 16278 diff changeset	2923 std::string cls = std::string(flex_yytext ()).substr (1);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2924
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2925 if (fq_identifier_contains_keyword (cls))
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2926 {
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	2927 error ("class and package names may not be keywords");
20957 9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20895 diff changeset	2928 // FIXME: This is no longer reachable now that error is exception based.
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2929 return LEXICAL_ERROR;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2930 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2931
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2932 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	2933 current_input_column));
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2934
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2935 current_input_column += flex_yyleng ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2936
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2937 return METAQUERY;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2938 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2939
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2940 int
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2941 octave_base_lexer::handle_fq_identifier (void)
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2942 {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2943 std::string tok = flex_yytext ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2944
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2945 if (fq_identifier_contains_keyword (tok))
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2946 {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2947 error ("function, method, class, and package names may not be keywords");
20957 9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20895 diff changeset	2948 // FIXME: This is no longer reachable now that error is exception based.
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2949 return LEXICAL_ERROR;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2950 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2951
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2952 push_token (new token (FQ_IDENT, tok, input_line_number,
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2953 current_input_column));
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2954
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2955 current_input_column += flex_yyleng ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2956
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2957 return FQ_IDENT;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2958 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	2959
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	2960 // 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	2961 // an identifier. Handles keywords. Return -1 if the identifier
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	2962 // should be ignored.
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	2963
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2964 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	2965 octave_base_lexer::handle_identifier (void)
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	2966 {
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2967 char *yytxt = flex_yytext ();
210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2968
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2969 std::string tok = yytxt;
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2970
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	2971 // If we are expecting a structure element, avoid recognizing
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	2972 // 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	2973 // a string that is also a valid identifier.
747 6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe] jwe parents: 661 diff changeset	2974
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2975 if (looking_at_indirect_ref)
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2976 {
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2977 push_token (new token (STRUCT_ELT, tok, input_line_number,
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	2978 current_input_column));
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2979
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2980 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	2981
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2982 current_input_column += flex_yyleng ();
2819 ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe] jwe parents: 2804 diff changeset	2983
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	2984 return STRUCT_ELT;
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2985 }
747 6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe] jwe parents: 661 diff changeset	2986
20188 e679dc89e64b allow keywords as structure fields again (bug #45092) John W. Eaton <jwe@octave.org> parents: 20184 diff changeset	2987 // If tok is a keyword token, then is_keyword_token will set
e679dc89e64b allow keywords as structure fields again (bug #45092) John W. Eaton <jwe@octave.org> parents: 20184 diff changeset	2988 // 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	2989 // 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	2990
e679dc89e64b allow keywords as structure fields again (bug #45092) John W. Eaton <jwe@octave.org> parents: 20184 diff changeset	2991 int kw_token = is_keyword_token (tok);
e679dc89e64b allow keywords as structure fields again (bug #45092) John W. Eaton <jwe@octave.org> parents: 20184 diff changeset	2992
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2993 if (looking_at_function_handle)
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	2994 {
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	2995 if (kw_token)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2996 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2997 error ("function handles may not refer to keywords");
20957 9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20895 diff changeset	2998 // FIXME: This is no longer reachable now that error is exception based.
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2999 return LEXICAL_ERROR;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3000 }
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3001 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3002 {
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	3003 push_token (new token (FCN_HANDLE, tok, input_line_number,
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3004 current_input_column));
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3005
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3006 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	3007 looking_for_object_index = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3008
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3009 at_beginning_of_statement = false;
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3010
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3011 return FCN_HANDLE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3012 }
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3013 }
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3014
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	3015 // 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	3016 // Keywords can be followed by identifiers.
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3017
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3018 if (kw_token)
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3019 {
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3020 if (kw_token >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3021 {
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3022 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	3023 looking_for_object_index = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3024 }
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3025
16783 0bf1d559b321 always set at_beginning_of_statement when recognizing keywords (bug #38758) John W. Eaton <jwe@octave.org> parents: 16756 diff changeset	3026 // 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	3027
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3028 return kw_token;
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3029 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3030
17355 f0edd6c752e9 don't convert "end" token to "__end__" for indexing John W. Eaton <jwe@octave.org> parents: 17343 diff changeset	3031 // Find the token in the symbol table.
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3032
16320 09f0cb9cac7d don't modify symbol table scope in the parser John W. Eaton <jwe@octave.org> parents: 16309 diff changeset	3033 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	3034
09f0cb9cac7d don't modify symbol table scope in the parser John W. Eaton <jwe@octave.org> parents: 16309 diff changeset	3035 token *tok_val = new token (NAME, &(symbol_table::insert (tok, sid)),
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3036 input_line_number, current_input_column);
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3037
16788 f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	3038 // 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	3039 //
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	3040 // pi +1
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	3041 //
f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	3042 // 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	3043 // 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	3044
16269 488b0fef52c5 7/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16267 diff changeset	3045 if (at_beginning_of_statement
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	3046 && (! (is_variable (tok)
16788 f89de736eecd correctly parse expressions like pi+1 (bug #39301) John W. Eaton <jwe@octave.org> parents: 16783 diff changeset	3047 \|\| tok == "e" \|\| tok == "pi"
16269 488b0fef52c5 7/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16267 diff changeset	3048 \|\| tok == "I" \|\| tok == "i"
488b0fef52c5 7/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16267 diff changeset	3049 \|\| tok == "J" \|\| tok == "j"
488b0fef52c5 7/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16267 diff changeset	3050 \|\| tok == "Inf" \|\| tok == "inf"
488b0fef52c5 7/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16267 diff changeset	3051 \|\| tok == "NaN" \|\| tok == "nan")))
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3052 tok_val->mark_may_be_command ();
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3053
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3054 push_token (tok_val);
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3055
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3056 current_input_column += flex_yyleng ();
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3057
17355 f0edd6c752e9 don't convert "end" token to "__end__" for indexing John W. Eaton <jwe@octave.org> parents: 17343 diff changeset	3058 // 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	3059
f0edd6c752e9 don't convert "end" token to "__end__" for indexing John W. Eaton <jwe@octave.org> parents: 17343 diff changeset	3060 if (tok != "end")
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3061 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	3062
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3063 at_beginning_of_statement = false;
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3064
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3065 return NAME;
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3066 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3067
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3068 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3069 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	3070 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3071 std::string nm = fcn_file_full_name;
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3072
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3073 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3074 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	3075 "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	3076 sep, input_line_number);
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3077 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3078 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	3079 "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	3080 sep, input_line_number, nm.c_str ());
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3081 }
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3082
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3083 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3084 octave_base_lexer::gripe_single_quote_string (void)
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3085 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3086 std::string nm = fcn_file_full_name;
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3087
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3088 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3089 warning_with_id ("Octave:single-quote-string",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3090 "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	3091 input_line_number);
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3092 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3093 warning_with_id ("Octave:single-quote-string",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3094 "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	3095 input_line_number, nm.c_str ());
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3096 }
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3097
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3098 void
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3099 octave_base_lexer::gripe_language_extension (const std::string& msg)
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3100 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3101 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	3102
fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3103 if (nm.empty ())
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3104 warning_with_id ("Octave:language-extension",
e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3105 "Octave language extension used: %s",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3106 msg.c_str ());
8974 fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3107 else
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3108 warning_with_id ("Octave:language-extension",
e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3109 "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	3110 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	3111 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3112
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3113 void
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3114 octave_base_lexer::maybe_gripe_language_extension_comment (char c)
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3115 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3116 if (c == '#')
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3117 gripe_language_extension ("# used as comment character");
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3118 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3119
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3120 void
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3121 octave_base_lexer::gripe_language_extension_continuation (void)
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3122 {
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3123 gripe_language_extension ("\\ used as line continuation marker");
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3124 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3125
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3126 void
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3127 octave_base_lexer::gripe_language_extension_operator (const std::string& op)
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3128 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3129 std::string t = op;
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3130 int n = t.length ();
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3131 if (t[n-1] == '\n')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3132 t.resize (n-1);
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3133 gripe_language_extension (t + " used as operator");
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3134 }
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3135
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3136 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3137 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	3138 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3139 YYSTYPE *lval = yyget_lval (scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3140 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	3141 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	3142 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3143
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3144 token *
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3145 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	3146 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3147 YYSTYPE *lval = yyget_lval (scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3148 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	3149 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3150
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3151 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3152 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	3153 {
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3154 switch (tok)
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3155 {
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3156 case '=': std::cerr << "'='\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3157 case ':': std::cerr << "':'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3158 case '-': std::cerr << "'-'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3159 case '+': std::cerr << "'+'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3160 case '': std::cerr << "''\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3161 case '/': std::cerr << "'/'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3162 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	3163 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	3164 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	3165 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	3166 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	3167 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	3168 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	3169 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	3170 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	3171 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	3172 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	3173 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	3174 case LSHIFT_EQ: std::cerr << "LSHIFT_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3175 case RSHIFT_EQ: std::cerr << "RSHIFT_EQ\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3176 case LSHIFT: std::cerr << "LSHIFT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3177 case RSHIFT: std::cerr << "RSHIFT\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3178 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	3179 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	3180 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	3181 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	3182 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	3183 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	3184 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	3185 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	3186 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	3187 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	3188 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	3189 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	3190 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	3191 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	3192 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	3193 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	3194 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	3195 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	3196 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	3197 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	3198 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	3199 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	3200 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	3201
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3202 case NUM:
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3203 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	3204 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3205 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	3206 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	3207 << " [" << 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	3208 }
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3209 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3210
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3211 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	3212 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3213 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	3214 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	3215 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3216 break;
16119 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 NAME:
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3219 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3220 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	3221 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	3222 std::cerr << "NAME";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3223 if (sr)
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3224 std::cerr << " [" << sr->name () << "]";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3225 std::cerr << "\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3226 }
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3227 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3228
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3229 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	3230
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3231 case DQ_STRING:
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3232 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	3233 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3234 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	3235
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3236 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	3237 << " [" << 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	3238 }
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3239 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3240
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3241 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	3242 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	3243 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	3244 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	3245 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	3246 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	3247 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	3248 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	3249 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	3250 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	3251 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	3252 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	3253 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	3254 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	3255 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	3256 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	3257 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	3258 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	3259 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	3260 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	3261 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	3262 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	3263 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	3264 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	3265 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	3266 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	3267 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	3268 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	3269 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	3270 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	3271 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	3272 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	3273 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	3274 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	3275 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	3276 default:
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3277 {
16166 cb80b1d062b1 don't attempt to print unprintable tokens John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	3278 if (tok < 256 && tok > 31)
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3279 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	3280 else
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3281 std::cerr << "UNKNOWN(" << tok << ")\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3282 }
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3283 break;
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 }
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 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3288 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	3289 {
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3290 error (msg);
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3291
20957 9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20895 diff changeset	3292 // FIXME: This is no longer reachable now that error is exception based.
16129 053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3293 OCTAVE_QUIT;
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3294
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3295 yy_fatal_error (msg, scanner);
16129 053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3296 }
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3297
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3298 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3299 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	3300 {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3301 if (lexer_debug_flag)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3302 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3303 std::cerr << std::endl;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3304
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3305 display_start_state ();
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3306
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3307 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	3308 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	3309 }
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3310 }
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3311
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3312 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3313 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	3314 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3315 OCTAVE_YYG;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3316
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3317 start_state_stack.push (state);
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3318
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3319 BEGIN (start_state ());
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3320 }
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3321
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3322 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3323 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	3324 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3325 OCTAVE_YYG;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3326
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3327 start_state_stack.pop ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3328
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3329 BEGIN (start_state ());
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3330 }
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3331
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3332 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3333 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	3334 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3335 while (! start_state_stack.empty ())
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3336 start_state_stack.pop ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3337
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3338 push_start_state (INITIAL);
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3339 }
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3340
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3341 void
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3342 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	3343 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3344 std::cerr << "S: ";
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3345
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3346 switch (start_state ())
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3347 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3348 case INITIAL:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3349 std::cerr << "INITIAL" << std::endl;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3350 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3351
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3352 case COMMAND_START:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3353 std::cerr << "COMMAND_START" << std::endl;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3354 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3355
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3356 case MATRIX_START:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3357 std::cerr << "MATRIX_START" << std::endl;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3358 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3359
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3360 case INPUT_FILE_START:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3361 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	3362 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3363
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3364 case BLOCK_COMMENT_START:
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3365 std::cerr << "BLOCK_COMMENT_START" << std::endl;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3366 break;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3367
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3368 case LINE_COMMENT_START:
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3369 std::cerr << "LINE_COMMENT_START" << std::endl;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3370 break;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3371
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3372 case DQ_STRING_START:
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3373 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	3374 break;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3375
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3376 case SQ_STRING_START:
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3377 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	3378 break;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	3379
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3380 default:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3381 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	3382 break;
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 }
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3385
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3386 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3387 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	3388 {
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3389 lexer_debug (pattern);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3390
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	3391 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	3392 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3393
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3394 int
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3395 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	3396 bool bos)
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3397 {
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3398 lexer_debug (pattern);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3399
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	3400 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	3401 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3402
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3403 bool
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3404 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	3405 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3406 int prev_tok = previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3407
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3408 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3409
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3410 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	3411 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3412 int c = text_yyinput ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3413 xunput (c);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3414
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3415 bool space_after = (c == ' ' \|\| c == '\t');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3416
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	3417 if (! (prev_tok == '[' \|\| prev_tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3418 \|\| previous_token_is_binop ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3419 \|\| ((tok == '+' \|\| tok == '-') && space_after)))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3420 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3421 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3422
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3423 return unput_comma;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3424 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3425
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3426 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3427 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	3428 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3429 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	3430 ? -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	3431 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3432
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3433 int
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3434 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	3435 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3436 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	3437 ? -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	3438 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	3439
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3440 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3441 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	3442 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3443 if (! compat)
19852 e9a0bd0b125c Rename 'matlab-incompatible' warning to 'language-extension'. Carnë Draug <carandraug@octave.org> parents: 19849 diff changeset	3444 gripe_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	3445
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	3446 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	3447
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3448 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	3449 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	3450 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	3451
16643 4258750c76ed don't push operator tokens twice John W. Eaton <jwe@octave.org> parents: 16365 diff changeset	3452 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	3453 }
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 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3456 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	3457 {
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	3458 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	3459 current_input_column);
16231 2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3460
2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3461 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	3462 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3463
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3464 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3465 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	3466 {
16231 2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3467 if (! tok_val)
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	3468 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	3469
2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3470 push_token (tok_val);
2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3471
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3472 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	3473
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3474 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	3475 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3476
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3477 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3478 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	3479 {
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3480 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	3481
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3482 push_token (tok_val);
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3483
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3484 return count_token_internal (tok);
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3485 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3486
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	3487 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3488 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	3489 {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3490 if (tok != '\n')
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3491 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3492 Vtoken_count++;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3493 token_count++;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3494 }
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 return show_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3497 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3498
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3499 int
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3500 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	3501 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3502 if (Vdisplay_tokens)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3503 display_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3504
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3505 if (lexer_debug_flag)
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 std::cerr << "R: ";
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3508 display_token (tok);
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3509 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	3510 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3511
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3512 return tok;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3513 }
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3514
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3515 void
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3516 octave_base_lexer::enable_fq_identifier (void)
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3517 {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3518 push_start_state (FQ_IDENT_START);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3519 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	3520
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3521 int
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3522 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	3523 {
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3524 int status = 0;
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3525
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3526 if (input_buf.empty ())
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3527 {
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3528 bool eof = false;
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3529 current_input_line = input_reader.get_input (eof);
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3530 input_buf.fill (current_input_line, eof);
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3531 }
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3532
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3533 if (! input_buf.empty ())
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3534 status = input_buf.copy_chunk (buf, max_size);
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3535 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	3536 status = YY_NULL;
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3537
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3538 return status;
57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	3539 }
16294 0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3540
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3541 int
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3542 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	3543 {
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3544 int status = 0;
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3545
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3546 if (input_buf.empty () && ! input_buf.at_eof ())
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3547 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	3548
16294 0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3549 if (! input_buf.empty ())
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3550 status = input_buf.copy_chunk (buf, max_size);
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3551 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	3552 status = YY_NULL;
16294 0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3553
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3554 return status;
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	3555 }
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	3556

Mercurial > octave

annotate libinterp/parse-tree/lex.ll @ 21055:5e00ed38a58b