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

annotate libinterp/parse-tree/lex.ll @ 19630:0e1f5a750d00

maint: Periodic merge of gui-release to default.

author	John W. Eaton <jwe@octave.org>
date	Tue, 20 Jan 2015 10:24:46 -0500
parents	5db5619fe54e fe689210525c
children	4197fc428c7d

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

Mercurial > octave-nkf

annotate libinterp/parse-tree/lex.ll @ 19630:0e1f5a750d00