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

annotate libinterp/parse-tree/lex.ll @ 16254:b8a2df776118 classdef

maint: periodic merge of default to classdef

author	John W. Eaton <jwe@octave.org>
date	Mon, 11 Mar 2013 14:04:05 -0400
parents	d8c0f46efaf0 a89cf57ba3a5
children	b28062b977fd

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
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 14074 diff changeset	3 Copyright (C) 1993-2012 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
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	46 %s COMMAND_START
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
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	54 %{
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 216 diff changeset	55
1341 e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	56 #include <cctype>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	57 #include <cstring>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	58
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	59 #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	60 #include <set>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5615 diff changeset	61 #include <sstream>
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	62 #include <string>
4214 b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe] jwe parents: 4208 diff changeset	63 #include <stack>
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	64
4093 5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4064 diff changeset	65 #include <sys/types.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4064 diff changeset	66 #include <unistd.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4064 diff changeset	67
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2900 diff changeset	68 #include "cmd-edit.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4131 diff changeset	69 #include "quit.h"
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	70 #include "lo-mappers.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2900 diff changeset	71
16154 aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment. John W. Eaton <jwe@octave.org> parents: 16150 diff changeset	72 // 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	73 // 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	74 // 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	75 // 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	76 // times.
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	77
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	78 #include "Cell.h"
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	79 #include "comment-list.h"
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2167 diff changeset	80 #include "defun.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	81 #include "error.h"
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	82 #include "gripes.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1341 diff changeset	83 #include "input.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	84 #include "lex.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	85 #include "ov.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	86 #include "parse.h"
14329 8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	87 #include "parse-private.h"
2987 ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe] jwe parents: 2982 diff changeset	88 #include "pt-all.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	89 #include "symtab.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	90 #include "token.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	91 #include "toplev.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	92 #include "utils.h"
94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	93 #include "variables.h"
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9476 diff changeset	94 #include <oct-parse.h>
2492 06595bc7f2d0 [project @ 1996-11-09 00:13:50 by jwe] jwe parents: 2375 diff changeset	95 #include <oct-gperf.h>
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	96
10426 4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	97 #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	98 // 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	99 // 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	100 // 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	101 #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	102 #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	103 #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	104 #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	105 #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	106 #endif
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	107
2716 2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	108 #if ! (defined (FLEX_SCANNER) \
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	109 && 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	110 && 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	111 #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	112 #endif
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	113
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	114 #define YY_EXTRA_TYPE octave_lexer *
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	115 #define curr_lexer yyextra
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	116
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	117 // Arrange to get input via readline.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	118
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	119 #ifdef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	120 #undef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	121 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	122 #define YY_INPUT(buf, result, max_size) \
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	123 result = curr_lexer->read (buf, max_size)
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	124
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	125 // 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	126
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	127 #ifdef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	128 #undef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	129 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	130 #define YY_FATAL_ERROR(msg) \
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	131 (yyget_extra (yyscanner))->fatal_error (msg)
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	132
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	133 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	134
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	135 static unsigned int Vtoken_count = 0;
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	136
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	137 // Internal variable for lexer debugging state.
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	138 static bool lexer_debug_flag = false;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	139
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	140 // Forward declarations for functions defined at the bottom of this
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	141 // file that are needed inside the lexer actions.
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	142
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	143 static std::string strip_trailing_whitespace (char *s);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	144
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	145 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	146
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	147 D [0-9]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	148 S [ \t]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	149 NL ((\n)\|(\r)\|(\r\n))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	150 SNL ({S}\|{NL})
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	151 EL (\.\.\.)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	152 BS (\\)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	153 CONT ({EL}\|{BS})
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	154 Im [iIjJ]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	155 CCHAR [#%]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	156 COMMENT ({CCHAR}.*{NL})
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	157 SNLCMT ({SNL}\|{COMMENT})
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	158 IDENT ([_$a-zA-Z][_$a-zA-Z0-9]*)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	159 EXPON ([DdEe][+-]?{D}+)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	160 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	161
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	162 ANY_INCLUDING_NL (.\|{NL})
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	163
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	164 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	165
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	166 %{
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	167 // 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	168 // the parser go down a special path.
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	169 %}
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	170
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	171 <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	172 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	173
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	174 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	175
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	176 // 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	177 // as the first token.
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	178 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	179
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	180 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	181
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	182 return curr_lexer->show_token (INPUT_FILE);
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	183 }
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	184
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	185 %{
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	186 // Help and other command-style functions.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	187 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	188
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	189 <COMMAND_START>{NL} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	190 curr_lexer->lexer_debug ("<COMMAND_START>{NL}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	191
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	192 curr_lexer->input_line_number++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	193 curr_lexer->current_input_column = 1;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	194
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	195 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	196 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	197 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	198 curr_lexer->at_beginning_of_statement = true;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	199
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	200 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	201
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	202 return curr_lexer->count_token ('\n');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	203 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	204
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	205 <COMMAND_START>[\;\,] {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	206 curr_lexer->lexer_debug ("<COMMAND_START>[\\;\\,]");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	207
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	208 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	209 curr_lexer->at_beginning_of_statement = true;
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	210
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	211 curr_lexer->pop_start_state ();
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	212
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	213 if (strcmp (yytext, ",") == 0)
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	214 return curr_lexer->handle_token (',');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	215 else
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	216 return curr_lexer->handle_token (';');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	217 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	218
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	219 <COMMAND_START>[\"\'] {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	220 curr_lexer->lexer_debug ("<COMMAND_START>[\\\"\\']");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	221
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	222 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	223
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	224 curr_lexer->current_input_column++;
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	225 int tok = curr_lexer->handle_string (yytext[0]);
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	226
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	227 return curr_lexer->count_token (tok);
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	228 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	229
4923 b11223097ad4 [project @ 2004-08-02 16:33:11 by jwe] jwe parents: 4910 diff changeset	230 <COMMAND_START>[^#% \t\r\n\;\,\"\'][^ \t\r\n\;\,]{S} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	231 curr_lexer->lexer_debug ("<COMMAND_START>[^#% \\t\\r\\n\\;\\,\\\"\\'][^ \\t\\r\\n\\;\\,]{S}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	232
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	233 std::string tok = strip_trailing_whitespace (yytext);
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	234
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	235 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	236 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	237
16231 2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	238 return curr_lexer->handle_token (tok, SQ_STRING);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	239 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	240
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	241 %{
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	242 // 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	243 // need to know if the next token is '=' or '=='.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	244 //
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	245 // 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	246 // 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	247 // operator.
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	248 //
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	249 // 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	250 // after seeing a ']' character...
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	251
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	252 // FIXME -- we need to handle block comments here.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	253 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	254
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	255 <MATRIX_START>{SNLCMT}\]{S} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	256 curr_lexer->lexer_debug ("<MATRIX_START>{SNLCMT}\\]{S}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	257
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	258 curr_lexer->scan_for_comments (yytext);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	259 curr_lexer->fixup_column_count (yytext);
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	260
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	261 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	262
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	263 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	264 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	265
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	266 int c = yytext[yyleng-1];
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	267 bool cont_is_spc = (curr_lexer->eat_continuation () != octave_lexer::NO_WHITESPACE);
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	268 bool spc_gobbled = (cont_is_spc \|\| c == ' ' \|\| c == '\t');
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	269 int tok_to_return = curr_lexer->handle_close_bracket (spc_gobbled, ']');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	270
5345 2781568bf951 [project @ 2005-05-10 05:31:12 by jwe] jwe parents: 5307 diff changeset	271 if (spc_gobbled)
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	272 curr_lexer->xunput (' ');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	273
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	274 return curr_lexer->count_token (tok_to_return);
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	275 }
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	276
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	277 %{
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	278 // FIXME -- we need to handle block comments here.
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	279 %}
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	280
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	281 <MATRIX_START>{SNLCMT}\}{S} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	282 curr_lexer->lexer_debug ("<MATRIX_START>{SNLCMT}\\}{S}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	283
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	284 curr_lexer->scan_for_comments (yytext);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	285 curr_lexer->fixup_column_count (yytext);
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	286
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	287 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	288
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	289 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	290 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	291
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	292 int c = yytext[yyleng-1];
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	293 bool cont_is_spc = (curr_lexer->eat_continuation () != octave_lexer::NO_WHITESPACE);
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	294 bool spc_gobbled = (cont_is_spc \|\| c == ' ' \|\| c == '\t');
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	295 int tok_to_return = curr_lexer->handle_close_bracket (spc_gobbled, '}');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	296
5345 2781568bf951 [project @ 2005-05-10 05:31:12 by jwe] jwe parents: 5307 diff changeset	297 if (spc_gobbled)
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	298 curr_lexer->xunput (' ');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	299
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	300 return curr_lexer->count_token (tok_to_return);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	301 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	302
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	303 %{
1088 0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	304 // Commas are element separators in matrix constants. If we don't
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	305 // check for continuations here we can end up inserting too many
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	306 // commas.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	307 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	308
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	309 <MATRIX_START>{S}\,{S} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	310 curr_lexer->lexer_debug ("<MATRIX_START>{S}\\,{S}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	311
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	312 curr_lexer->current_input_column += yyleng;
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	313
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	314 int tmp = curr_lexer->eat_continuation ();
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	315
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	316 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	317 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	318 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	319 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	320
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	321 if (! curr_lexer->looking_at_object_index.front ())
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	322 {
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	323 if ((tmp & octave_lexer::NEWLINE) == octave_lexer::NEWLINE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	324 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	325 curr_lexer->maybe_warn_separator_insert (';');
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	326
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	327 curr_lexer->xunput (';');
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	328 }
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	329 }
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	330
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	331 return curr_lexer->count_token (',');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	332 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	333
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	334 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	335 // In some cases, spaces in matrix constants can turn into commas.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	336 // If commas are required, spaces are not important in matrix
1088 0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	337 // constants so we just eat them. If we don't check for continuations
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	338 // here we can end up inserting too many commas.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	339 %}
430 8464d5778a09 [project @ 1994-05-25 08:33:54 by jwe] jwe parents: 428 diff changeset	340
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	341 <MATRIX_START>{S}+ {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	342 curr_lexer->lexer_debug ("<MATRIX_START>{S}+");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	343
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	344 curr_lexer->current_input_column += yyleng;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	345
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	346 curr_lexer->at_beginning_of_statement = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	347
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	348 int tmp = curr_lexer->eat_continuation ();
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	349
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	350 if (! curr_lexer->looking_at_object_index.front ())
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	351 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	352 bool bin_op = curr_lexer->next_token_is_bin_op (true);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	353 bool postfix_un_op = curr_lexer->next_token_is_postfix_unary_op (true);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	354 bool sep_op = curr_lexer->next_token_is_sep_op ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	355
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	356 if (! (postfix_un_op \|\| bin_op \|\| sep_op)
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	357 && curr_lexer->nesting_level.is_bracket_or_brace ()
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	358 && curr_lexer->convert_spaces_to_comma)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	359 {
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	360 if ((tmp & octave_lexer::NEWLINE) == octave_lexer::NEWLINE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	361 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	362 curr_lexer->maybe_warn_separator_insert (';');
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	363
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	364 curr_lexer->xunput (';');
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	365 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	366
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	367 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	368 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	369 curr_lexer->looking_for_object_index = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	370
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	371 curr_lexer->maybe_warn_separator_insert (',');
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	372
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	373 return curr_lexer->count_token (',');
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	374 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	375 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	376 }
430 8464d5778a09 [project @ 1994-05-25 08:33:54 by jwe] jwe parents: 428 diff changeset	377
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	378 %{
1088 0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	379 // Semicolons are handled as row seprators in matrix constants. If we
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	380 // don't eat whitespace here we can end up inserting too many
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	381 // semicolons.
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	382
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	383 // FIXME -- we need to handle block comments here.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	384 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	385
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	386 <MATRIX_START>{SNLCMT};{SNLCMT} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	387 curr_lexer->lexer_debug ("<MATRIX_START>{SNLCMT};{SNLCMT}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	388
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	389 curr_lexer->scan_for_comments (yytext);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	390 curr_lexer->fixup_column_count (yytext);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	391 curr_lexer->eat_whitespace ();
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	392
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	393 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	394 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	395 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	396 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	397
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	398 return curr_lexer->count_token (';');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	399 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	400
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	401 %{
1088 0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	402 // In some cases, new lines can also become row separators. If we
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	403 // don't eat whitespace here we can end up inserting too many
0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	404 // semicolons.
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	405
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	406 // FIXME -- we need to handle block comments here.
985 4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	407 %}
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	408
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	409 <MATRIX_START>{S}{COMMENT}{SNLCMT} \|
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	410 <MATRIX_START>{S}{NL}{SNLCMT} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	411 curr_lexer->lexer_debug ("<MATRIX_START>{S}{COMMENT}{SNLCMT}\|<MATRIX_START>{S}{NL}{SNLCMT}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	412
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	413 curr_lexer->scan_for_comments (yytext);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	414 curr_lexer->fixup_column_count (yytext);
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	415 curr_lexer->eat_whitespace ();
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	416
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	417 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	418 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	419 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	420
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	421 if (curr_lexer->nesting_level.none ())
4476 b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	422 return LEXICAL_ERROR;
985 4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	423
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	424 if (! curr_lexer->looking_at_object_index.front ()
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	425 && curr_lexer->nesting_level.is_bracket_or_brace ())
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	426 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	427 curr_lexer->maybe_warn_separator_insert (';');
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	428
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	429 return curr_lexer->count_token (';');
985 4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	430 }
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	431 }
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	432
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	433 \[{S}* {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	434 curr_lexer->lexer_debug ("\\[{S}*");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	435
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	436 curr_lexer->nesting_level.bracket ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	437
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	438 curr_lexer->looking_at_object_index.push_front (false);
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	439
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	440 curr_lexer->current_input_column += yyleng;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	441 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	442 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	443 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	444 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	445
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	446 if (curr_lexer->defining_func
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	447 && ! curr_lexer->parsed_function_name.top ())
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	448 curr_lexer->looking_at_return_list = true;
5615 d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe] jwe parents: 5570 diff changeset	449 else
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	450 curr_lexer->looking_at_matrix_or_assign_lhs = true;
5615 d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe] jwe parents: 5570 diff changeset	451
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	452 curr_lexer->decrement_promptflag ();
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	453 curr_lexer->eat_whitespace ();
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	454
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	455 curr_lexer->bracketflag++;
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	456
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	457 curr_lexer->push_start_state (MATRIX_START);
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	458
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	459 return curr_lexer->count_token ('[');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	460 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	461
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	462 \] {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	463 curr_lexer->lexer_debug ("\\]");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	464
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	465 curr_lexer->nesting_level.remove ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	466
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	467 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	468
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	469 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	470 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	471
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	472 return curr_lexer->handle_token (']');
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	473 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	474
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	475 %{
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	476 // Gobble comments.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	477 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	478
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	479 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	480 // 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	481 // 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	482 // block.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	483 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	484
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	485 ^{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	486 curr_lexer->lexer_debug ("^{S}{CCHAR}\{{S}{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	487
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	488 yyless (0);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	489
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	490 if (curr_lexer->start_state () == LINE_COMMENT_START)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	491 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	492 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	493 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	494
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	495 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	496 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	497
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	498 curr_lexer->push_start_state (BLOCK_COMMENT_START);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	499
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	500 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	501
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	502 <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	503 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	504
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	505 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	506 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	507
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	508 if (curr_lexer->block_comment_nesting_level)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	509 curr_lexer->comment_text = "\n";
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	510
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	511 curr_lexer->block_comment_nesting_level++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	512 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	513
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	514 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	515 // 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	516 // 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	517 // before storing the comment.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	518 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	519
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	520 <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	521 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	522
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	523 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	524 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	525
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	526 if (curr_lexer->block_comment_nesting_level > 1)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	527 curr_lexer->comment_text = "\n";
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	528 else
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	529 curr_lexer->finish_comment (octave_comment_elt::block);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	530
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	531 curr_lexer->block_comment_nesting_level--;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	532 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	533 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	534
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	535 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	536 // Body of a block comment.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	537 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	538
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	539 <BLOCK_COMMENT_START>.*{NL} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	540 curr_lexer->lexer_debug ("<BLOCK_COMMENT_START>.*{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	541
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	542 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	543 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	544 curr_lexer->comment_text += yytext;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	545 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	546
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	547 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	548 // Full-line or end-of-line comment.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	549 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	550
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	551 {S}{CCHAR}.{NL} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	552 curr_lexer->lexer_debug ("{S}{CCHAR}.{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	553
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	554 curr_lexer->push_start_state (LINE_COMMENT_START);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	555 yyless (0);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	556 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	557
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	558 <LINE_COMMENT_START>{S}{CCHAR}.{NL} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	559 curr_lexer->lexer_debug ("<LINE_COMMENT_START>{S}{CCHAR}.{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	560
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	561 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	562 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	563 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	564
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	565 size_t len = yyleng;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	566 size_t i = 0;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	567 while (i < len)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	568 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	569 char c = yytext[i];
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	570 if (c == '#' \|\| c == '%' \|\| c == ' ' \|\| c == '\t')
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	571 i++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	572 else
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	573 break;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	574 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	575
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	576 curr_lexer->comment_text += &yytext[i];
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	577
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	578 if (! full_line_comment)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	579 {
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	580 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	581
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	582 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	583 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	584 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	585
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	586 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	587 // End of a block of full-line comments.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	588 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	589
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	590 <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	591 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	592
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	593 curr_lexer->xunput (yytext[0]);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	594
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	595 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	596
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	597 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	598 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	599
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	600 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	601 // Imaginary numbers.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	602 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	603
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	604 {NUMBER}{Im} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	605 curr_lexer->lexer_debug ("{NUMBER}{Im}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	606
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	607 curr_lexer->handle_number ();
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	608 return curr_lexer->count_token (IMAG_NUM);
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	609 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	610
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	611 %{
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	612 // 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	613 // the constant.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	614 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	615
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	616 {D}+/\.[\*/\\^\'] \|
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	617 {NUMBER} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	618 curr_lexer->lexer_debug ("{D}+/\\.[\\*/\\^\\']\|{NUMBER}");
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	619 curr_lexer->handle_number ();
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	620 return curr_lexer->count_token (NUM);
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	621 }
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 // 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	625 // the <MATRIX_START> start state code above.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	626 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	627
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	628 {S}* {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	629 curr_lexer->current_input_column += yyleng;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	630 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	631
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	632 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	633 // Continuation lines. Allow comments after continuations.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	634 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	635
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	636 {CONT}{S}*{NL} \|
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	637 {CONT}{S}{CCHAR}.{NL} {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	638 curr_lexer->lexer_debug ("{CONT}{S}{NL}\|{CONT}{S}{CCHAR}.*{NL}");
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	639
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	640 curr_lexer->handle_continuation ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	641 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	642
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	643 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	644 // End of file.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	645 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	646
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	647 <<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	648 return curr_lexer->handle_end_of_input ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	649 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	650
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	651 %{
970 9382316a8a01 [project @ 1994-12-12 06:03:34 by jwe] jwe parents: 969 diff changeset	652 // Identifiers. Truncate the token at the first space or tab but
9382316a8a01 [project @ 1994-12-12 06:03:34 by jwe] jwe parents: 969 diff changeset	653 // don't write directly on yytext.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	654 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	655
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	656 {IDENT}{S}* {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	657 curr_lexer->lexer_debug ("{IDENT}{S}*");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	658
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	659 int id_tok = curr_lexer->handle_identifier ();
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	660
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	661 if (id_tok >= 0)
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	662 return curr_lexer->count_token (id_tok);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	663 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	664
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	665 %{
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	666 // Superclass method identifiers.
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	667 %}
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	668
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	669 {IDENT}@{IDENT}{S}* \|
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	670 {IDENT}@{IDENT}.{IDENT}{S}* {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	671 curr_lexer->lexer_debug ("{IDENT}@{IDENT}{S}\|{IDENT}@{IDENT}.{IDENT}{S}");
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	672
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	673 int id_tok = curr_lexer->handle_superclass_identifier ();
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	674
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	675 if (id_tok >= 0)
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	676 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	677 curr_lexer->looking_for_object_index = true;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	678
16236 d8c0f46efaf0 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16212 16231 diff changeset	679 return curr_lexer->count_token (id_tok);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	680 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	681 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	682
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	683 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	684 // Metaclass query
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	685 %}
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	686
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	687 \?{IDENT}{S}* \|
14638 5b0872b5b234 fix missing backslash quoting in lexer rules John W. Eaton <jwe@octave.org> parents: 14510 diff changeset	688 \?{IDENT}\.{IDENT}{S}* {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	689 curr_lexer->lexer_debug ("\\?{IDENT}{S}\|\\?{IDENT}\\.{IDENT}{S}");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	690
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	691 int id_tok = curr_lexer->handle_meta_identifier ();
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	692
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	693 if (id_tok >= 0)
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	694 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	695 curr_lexer->looking_for_object_index = true;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	696
16236 d8c0f46efaf0 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16212 16231 diff changeset	697 return curr_lexer->count_token (id_tok);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	698 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	699 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	700
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	701 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	702 // Function handles and superclass references
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	703 %}
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	704
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	705 "@" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	706 curr_lexer->lexer_debug ("@");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	707
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	708 curr_lexer->current_input_column++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	709
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	710 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	711 curr_lexer->convert_spaces_to_comma = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	712 curr_lexer->looking_at_function_handle++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	713 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	714 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	715
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	716 return curr_lexer->count_token ('@');
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	717
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	718 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	719
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	720 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	721 // 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	722 // 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	723 // 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	724 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	725
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	726 {NL} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	727 curr_lexer->lexer_debug ("{NL}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	728
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	729 curr_lexer->input_line_number++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	730 curr_lexer->current_input_column = 1;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	731
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	732 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	733 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	734
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	735 if (curr_lexer->nesting_level.none ())
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	736 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	737 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	738 return curr_lexer->count_token ('\n');
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	739 }
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	740 else if (curr_lexer->nesting_level.is_paren ())
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	741 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	742 curr_lexer->at_beginning_of_statement = false;
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	743 curr_lexer->gripe_matlab_incompatible ("bare newline inside parentheses");
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	744 }
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	745 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	746 return LEXICAL_ERROR;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	747 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	748
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	749 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	750 // 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	751 // operator.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	752 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	753
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	754 "'" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	755 curr_lexer->lexer_debug ("'");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	756
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	757 curr_lexer->current_input_column++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	758 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	759
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	760 if (curr_lexer->quote_is_transpose)
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	761 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	762 curr_lexer->do_comma_insert_check ();
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	763 return curr_lexer->count_token (QUOTE);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	764 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	765 else
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	766 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	767 int tok = curr_lexer->handle_string ('\'');
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	768 return curr_lexer->count_token (tok);
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	769 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	770 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	771
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	772 %{
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	773 // Double quotes always begin strings.
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	774 %}
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	775
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	776 \" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	777 curr_lexer->lexer_debug ("\"");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	778
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	779 curr_lexer->current_input_column++;
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	780 int tok = curr_lexer->handle_string ('"');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	781
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	782 return curr_lexer->count_token (tok);
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	783 }
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	784
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	785 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	786 // Other operators.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	787 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	788
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	789 ":" { return curr_lexer->handle_op (":", ':'); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	790 ".+" { return curr_lexer->handle_incompatible_op (".+", EPLUS); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	791 ".-" { return curr_lexer->handle_incompatible_op (".-", EMINUS); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	792 "." { return curr_lexer->handle_op (".", EMUL); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	793 "./" { return curr_lexer->handle_op ("./", EDIV); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	794 ".\\" { return curr_lexer->handle_op (".\\", ELEFTDIV); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	795 ".^" { return curr_lexer->handle_op (".^", EPOW); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	796 "." { return curr_lexer->handle_incompatible_op (".", EPOW); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	797 "<=" { return curr_lexer->handle_op ("<=", EXPR_LE); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	798 "==" { return curr_lexer->handle_op ("==", EXPR_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	799 "~=" { return curr_lexer->handle_op ("~=", EXPR_NE); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	800 "!=" { return curr_lexer->handle_incompatible_op ("!=", EXPR_NE); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	801 ">=" { return curr_lexer->handle_op (">=", EXPR_GE); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	802 "&" { return curr_lexer->handle_op ("&", EXPR_AND); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	803 "\|" { return curr_lexer->handle_op ("\|", EXPR_OR); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	804 "<" { return curr_lexer->handle_op ("<", EXPR_LT); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	805 ">" { return curr_lexer->handle_op (">", EXPR_GT); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	806 "+" { return curr_lexer->handle_op ("+", '+'); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	807 "-" { return curr_lexer->handle_op ("-", '-'); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	808 "" { return curr_lexer->handle_op ("", '*'); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	809 "/" { return curr_lexer->handle_op ("/", '/'); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	810 "\\" { return curr_lexer->handle_op ("\\", LEFTDIV); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	811 "^" { return curr_lexer->handle_op ("^", POW); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	812 "" { return curr_lexer->handle_incompatible_op ("", POW); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	813 "=" { return curr_lexer->handle_op ("=", '=', true, false); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	814 "&&" { return curr_lexer->handle_op ("&&", EXPR_AND_AND); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	815 "\|\|" { return curr_lexer->handle_op ("\|\|", EXPR_OR_OR); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	816 "<<" { return curr_lexer->handle_incompatible_op ("<<", LSHIFT); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	817 ">>" { return curr_lexer->handle_incompatible_op (">>", RSHIFT); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	818 "~" { return curr_lexer->handle_op ("~", EXPR_NOT); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	819 "!" { return curr_lexer->handle_incompatible_op ("!", EXPR_NOT); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	820 ";" { return curr_lexer->handle_op (";", ';', true, true); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	821
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	822 "," {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	823 return curr_lexer->handle_op
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	824 (",", ',', true, ! curr_lexer->looking_at_object_index.front ());
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	825 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	826
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	827 ".'" {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	828 curr_lexer->do_comma_insert_check ();
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	829 return curr_lexer->handle_op (".'", TRANSPOSE, true, false);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	830 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	831
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	832 "++" {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	833 curr_lexer->do_comma_insert_check ();
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	834 return curr_lexer->handle_incompatible_op
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	835 ("++", PLUS_PLUS, true, false, true);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	836 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	837
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	838 "--" {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	839 ;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	840 curr_lexer->do_comma_insert_check ();
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	841 return curr_lexer->handle_incompatible_op
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	842 ("--", MINUS_MINUS, true, false, true);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	843 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	844
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	845 "(" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	846 curr_lexer->lexer_debug ("(");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	847
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	848 // If we are looking for an object index, then push TRUE for
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	849 // looking_at_object_index. Otherwise, just push whatever state
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	850 // is current (so that we can pop it off the stack when we find
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	851 // the matching close paren).
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	852
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	853 curr_lexer->looking_at_object_index.push_front
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	854 (curr_lexer->looking_for_object_index);
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	855
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	856 curr_lexer->looking_at_indirect_ref = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	857 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	858 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	859
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	860 curr_lexer->nesting_level.paren ();
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	861 curr_lexer->decrement_promptflag ();
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	862
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	863 return curr_lexer->handle_token ('(');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	864 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	865
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	866 ")" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	867 curr_lexer->lexer_debug (")");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	868
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	869 curr_lexer->nesting_level.remove ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	870 curr_lexer->current_input_column++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	871
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	872 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	873
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	874 curr_lexer->quote_is_transpose = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	875 curr_lexer->convert_spaces_to_comma
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	876 = (curr_lexer->nesting_level.is_bracket_or_brace ()
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	877 && ! curr_lexer->looking_at_anon_fcn_args);
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	878 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	879 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	880
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	881 if (curr_lexer->looking_at_anon_fcn_args)
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	882 curr_lexer->looking_at_anon_fcn_args = false;
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 12801 diff changeset	883
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	884 curr_lexer->do_comma_insert_check ();
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	885
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	886 return curr_lexer->count_token (')');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	887 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	888
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	889 "." {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	890 curr_lexer->lexer_debug (".");
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	891
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	892 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	893 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	894
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	895 return curr_lexer->handle_token ('.');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	896 }
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	897
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	898 %{
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	899 // op= operators.
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	900 %}
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	901
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	902 "+=" { return curr_lexer->handle_incompatible_op ("+=", ADD_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	903 "-=" { return curr_lexer->handle_incompatible_op ("-=", SUB_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	904 "=" { return curr_lexer->handle_incompatible_op ("=", MUL_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	905 "/=" { return curr_lexer->handle_incompatible_op ("/=", DIV_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	906 "\\=" { return curr_lexer->handle_incompatible_op ("\\=", LEFTDIV_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	907 ".+=" { return curr_lexer->handle_incompatible_op (".+=", ADD_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	908 ".-=" { return curr_lexer->handle_incompatible_op (".-=", SUB_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	909 ".=" { return curr_lexer->handle_incompatible_op (".=", EMUL_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	910 "./=" { return curr_lexer->handle_incompatible_op ("./=", EDIV_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	911 ".\\=" { return curr_lexer->handle_incompatible_op (".\\=", ELEFTDIV_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	912 "^=" { return curr_lexer->handle_incompatible_op ("^=", POW_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	913 "**=" { return curr_lexer->handle_incompatible_op ("^=", POW_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	914 ".^=" { return curr_lexer->handle_incompatible_op (".^=", EPOW_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	915 ".**=" { return curr_lexer->handle_incompatible_op (".^=", EPOW_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	916 "&=" { return curr_lexer->handle_incompatible_op ("&=", AND_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	917 "\|=" { return curr_lexer->handle_incompatible_op ("\|=", OR_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	918 "<<=" { return curr_lexer->handle_incompatible_op ("<<=", LSHIFT_EQ); }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	919 ">>=" { return curr_lexer->handle_incompatible_op (">>=", RSHIFT_EQ); }
2877 5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe] jwe parents: 2861 diff changeset	920
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	921 \{{S}* {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	922 curr_lexer->lexer_debug ("\\{{S}*");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	923
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	924 curr_lexer->nesting_level.brace ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	925
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	926 curr_lexer->looking_at_object_index.push_front
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	927 (curr_lexer->looking_for_object_index);
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	928
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	929 curr_lexer->current_input_column += yyleng;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	930 curr_lexer->quote_is_transpose = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	931 curr_lexer->convert_spaces_to_comma = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	932 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	933 curr_lexer->at_beginning_of_statement = false;
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	934
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	935 curr_lexer->decrement_promptflag ();
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	936 curr_lexer->eat_whitespace ();
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	937
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	938 curr_lexer->braceflag++;
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	939
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	940 curr_lexer->push_start_state (MATRIX_START);
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	941
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	942 return curr_lexer->count_token ('{');
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	943 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	944
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	945 "}" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	946 curr_lexer->lexer_debug ("}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	947
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	948 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	949
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	950 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	951 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	952
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	953 curr_lexer->nesting_level.remove ();
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	954
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	955 return curr_lexer->handle_token ('}');
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	956 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	957
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	958 %{
2066 a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe] jwe parents: 2042 diff changeset	959 // Unrecognized input is a lexical error.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	960 %}
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	961
2042 31f4f775b8c6 [project @ 1996-03-28 09:06:28 by jwe] jwe parents: 1994 diff changeset	962 . {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	963 curr_lexer->lexer_debug (".");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	964
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	965 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	966
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	967 int c = curr_lexer->text_yyinput ();
4248 eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe] jwe parents: 4241 diff changeset	968
eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe] jwe parents: 4241 diff changeset	969 if (c != EOF)
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	970 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	971 curr_lexer->current_input_column++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	972
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	973 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	974 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	975 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	976
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	977 return LEXICAL_ERROR;
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	978 }
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	979 else
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	980 return curr_lexer->handle_end_of_input ();
2066 a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe] jwe parents: 2042 diff changeset	981 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	982
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	983 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	984
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	985 static void
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	986 display_character (char c)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	987 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	988 if (isgraph (c))
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	989 std::cerr << c;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	990 else
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	991 switch (c)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	992 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	993 case 0:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	994 std::cerr << "NUL";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	995 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	996
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	997 case 1:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	998 std::cerr << "SOH";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	999 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1000
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1001 case 2:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1002 std::cerr << "STX";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1003 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1004
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1005 case 3:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1006 std::cerr << "ETX";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1007 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1008
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1009 case 4:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1010 std::cerr << "EOT";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1011 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1012
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1013 case 5:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1014 std::cerr << "ENQ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1015 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1016
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1017 case 6:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1018 std::cerr << "ACK";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1019 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1020
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1021 case 7:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1022 std::cerr << "\\a";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1023 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1024
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1025 case 8:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1026 std::cerr << "\\b";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1027 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1028
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1029 case 9:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1030 std::cerr << "\\t";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1031 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1032
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1033 case 10:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1034 std::cerr << "\\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1035 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1036
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1037 case 11:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1038 std::cerr << "\\v";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1039 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1040
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1041 case 12:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1042 std::cerr << "\\f";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1043 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1044
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1045 case 13:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1046 std::cerr << "\\r";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1047 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1048
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1049 case 14:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1050 std::cerr << "SO";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1051 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1052
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1053 case 15:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1054 std::cerr << "SI";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1055 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1056
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1057 case 16:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1058 std::cerr << "DLE";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1059 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1060
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1061 case 17:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1062 std::cerr << "DC1";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1063 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1064
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1065 case 18:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1066 std::cerr << "DC2";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1067 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1068
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1069 case 19:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1070 std::cerr << "DC3";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1071 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1072
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1073 case 20:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1074 std::cerr << "DC4";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1075 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1076
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1077 case 21:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1078 std::cerr << "NAK";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1079 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1080
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1081 case 22:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1082 std::cerr << "SYN";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1083 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1084
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1085 case 23:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1086 std::cerr << "ETB";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1087 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1088
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1089 case 24:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1090 std::cerr << "CAN";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1091 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1092
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1093 case 25:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1094 std::cerr << "EM";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1095 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1096
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1097 case 26:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1098 std::cerr << "SUB";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1099 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1100
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1101 case 27:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1102 std::cerr << "ESC";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1103 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1104
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1105 case 28:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1106 std::cerr << "FS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1107 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1108
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1109 case 29:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1110 std::cerr << "GS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1111 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1112
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1113 case 30:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1114 std::cerr << "RS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1115 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1116
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1117 case 31:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1118 std::cerr << "US";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1119 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1120
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1121 case 32:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1122 std::cerr << "SPACE";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1123 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1124
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1125 case 127:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1126 std::cerr << "DEL";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1127 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1128 }
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1129 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1130
13973 2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1131 void
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1132 cleanup_parser (void)
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1133 {
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1134 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1135
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1136 // Return 1 if the given character matches any character in the given
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1137 // string.
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1138
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1139 static bool
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1140 match_any (char c, const char *s)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1141 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1142 char tmp;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1143 while ((tmp = *s++) != '\0')
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1144 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1145 if (c == tmp)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1146 return true;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1147 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1148 return false;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1149 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1150
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1151 // Given information about the spacing surrounding an operator,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1152 // return 1 if it looks like it should be treated as a binary
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1153 // operator. For example,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1154 //
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1155 // [ 1 + 2 ] or [ 1+ 2] or [ 1+2 ] ==> binary
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1156 //
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1157 // [ 1 +2 ] ==> unary
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1158
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1159 static bool
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1160 looks_like_bin_op (bool spc_prev, int next_char)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1161 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1162 bool spc_next = (next_char == ' ' \|\| next_char == '\t');
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1163
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1164 return ((spc_prev && spc_next) \|\| ! spc_prev);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1165 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1166
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1167 bool
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1168 is_keyword (const std::string& s)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1169 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1170 // Parsing function names like "set.property_name" inside
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1171 // 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	1172 // "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	1173 // 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	1174 // 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	1175
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1176 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	1177 && ! (s == "set" \|\| s == "get"));
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1178 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1179
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1180 DEFUN (iskeyword, args, ,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1181 "-- texinfo --\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1182 @deftypefn {Built-in Function} {} iskeyword ()\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1183 @deftypefnx {Built-in Function} {} iskeyword (@var{name})\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1184 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	1185 is omitted, return a list of keywords.\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1186 @seealso{isvarname, exist}\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1187 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1188 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1189 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1190
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1191 int argc = args.length () + 1;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1192
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1193 string_vector argv = args.make_argv ("iskeyword");
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1194
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1195 if (error_state)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1196 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1197
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1198 if (argc == 1)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1199 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1200 // 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	1201 // is_keyword function for additional details.
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1202
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1203 string_vector lst (TOTAL_KEYWORDS);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1204
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1205 int j = 0;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1206
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1207 for (int i = 0; i < TOTAL_KEYWORDS; i++)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1208 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1209 std::string tmp = wordlist[i].name;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1210
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1211 if (! (tmp == "set" \|\| tmp == "get"))
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1212 lst[j++] = tmp;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1213 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1214
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1215 lst.resize (j);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1216
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1217 retval = Cell (lst.sort ());
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1218 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1219 else if (argc == 2)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1220 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1221 retval = is_keyword (argv[1]);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1222 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1223 else
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1224 print_usage ();
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1225
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1226 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1227 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1228
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1229 /*
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1230
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1231 %!assert (iskeyword ("for"))
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1232 %!assert (iskeyword ("fort"), false)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1233 %!assert (iskeyword ("fft"), false)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1234
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1235 */
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1236
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1237 // Used to delete trailing white space from tokens.
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1238
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1239 static std::string
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1240 strip_trailing_whitespace (char *s)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1241 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1242 std::string retval = s;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1243
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1244 size_t pos = retval.find_first_of (" \t");
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1245
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1246 if (pos != std::string::npos)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1247 retval.resize (pos);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1248
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1249 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1250 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1251
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1252 DEFUN (__display_tokens__, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1253 "-- texinfo --\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1254 @deftypefn {Built-in Function} {} __display_tokens__ ()\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1255 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	1256 lexer displays tokens as they are read.\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1257 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1258 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1259 return SET_INTERNAL_VARIABLE (display_tokens);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1260 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1261
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1262 DEFUN (__token_count__, , ,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1263 "-- texinfo --\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1264 @deftypefn {Built-in Function} {} __token_count__ ()\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1265 Number of language tokens processed since Octave startup.\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1266 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1267 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1268 return octave_value (Vtoken_count);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1269 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1270
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1271 DEFUN (__lexer_debug_flag__, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1272 "-- texinfo --\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1273 @deftypefn {Built-in Function} {@var{old_val} =} __lexer_debug_flag__ (@var{new_val}))\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1274 Undocumented internal function.\n\
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1275 @end deftypefn")
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1276 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1277 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1278
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1279 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	1280 "__lexer_debug_flag__");
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1281
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1282 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1283 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1284
16117 771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1285 class
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1286 flex_stream_reader : public stream_reader
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1287 {
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1288 public:
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1289 flex_stream_reader (octave_lexer l, char buf_arg)
16117 771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1290 : stream_reader (), lexer (l), buf (buf_arg)
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1291 { }
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1292
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1293 int getc (void) { return lexer->text_yyinput (); }
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1294 int ungetc (int c) { lexer->xunput (c, buf); return 0; }
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1295
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1296 private:
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1297
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1298 // No copying!
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1299
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1300 flex_stream_reader (const flex_stream_reader&);
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1301
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1302 flex_stream_reader& operator = (const flex_stream_reader&);
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1303
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1304 octave_lexer *lexer;
16117 771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1305
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1306 char *buf;
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1307 };
771186909285 maint: move class definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16116 diff changeset	1308
16193 d7392bf42fd1 use inheritance to simplify initialization in octave_lexer constructor John W. Eaton <jwe@octave.org> parents: 16183 diff changeset	1309 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	1310 {
16230 4bf907906134 use a queue to hold tokens in the lexer John W. Eaton <jwe@octave.org> parents: 16229 diff changeset	1311 tokens.clear ();
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1312 }
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1313
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1314 void
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1315 lexical_feedback::init (void)
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1316 {
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1317 // 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	1318 // index.
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1319 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	1320 }
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1321
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1322 void
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1323 lexical_feedback::reset (void)
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1324 {
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1325 end_of_input = false;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1326 convert_spaces_to_comma = true;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1327 do_comma_insert = false;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1328 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	1329 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	1330 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	1331 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	1332 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	1333 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	1334 looking_at_matrix_or_assign_lhs = false;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1335 looking_for_object_index = false;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1336 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	1337 parsing_class_method = false;
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	1338 parsing_classdef = false;
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1339 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	1340 parsing_classdef_get_method = false;
3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	1341 parsing_classdef_set_method = false;
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1342 quote_is_transpose = false;
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1343 force_script = false;
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	1344 reading_fcn_file = false;
810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	1345 reading_script_file = false;
810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	1346 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	1347 input_line_number = 1;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1348 current_input_column = 1;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1349 bracketflag = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1350 braceflag = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1351 looping = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1352 defining_func = 0;
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1353 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	1354 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	1355 token_count = 0;
16207 0467d68ca891 move current_input_line to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	1356 current_input_line = "";
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1357 comment_text = "";
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1358 help_text = "";
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1359 fcn_file_name = "";
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1360 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	1361 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	1362 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	1363
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1364 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	1365 parsed_function_name.pop ();
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1366
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1367 pending_local_variables.clear ();
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1368
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1369 nesting_level.reset ();
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1370
16230 4bf907906134 use a queue to hold tokens in the lexer John W. Eaton <jwe@octave.org> parents: 16229 diff changeset	1371 tokens.clear ();
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1372 }
b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1373
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1374 static bool
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1375 looks_like_copyright (const std::string& s)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1376 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1377 bool retval = false;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1378
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1379 if (! s.empty ())
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1380 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1381 size_t offset = s.find_first_not_of (" \t");
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1382
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1383 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	1384 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1385
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1386 return retval;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1387 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	1388
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1389 void
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	1390 octave_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	1391 {
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	1392 buffer = input;
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1393 chars_left = buffer.length ();
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1394 pos = buffer.c_str ();
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	1395 eof = eof_arg;
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1396 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1397
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1398 int
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1399 octave_lexer::input_buffer::copy_chunk (char *buf, size_t max_size)
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1400 {
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1401 static const char * const eol = "\n";
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1402
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1403 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	1404 assert (len > 0);
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1405
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1406 memcpy (buf, pos, len);
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1407
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1408 chars_left -= len;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1409 pos += len;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1410
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1411 // 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	1412 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	1413 {
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1414 if (len < max_size)
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1415 {
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1416 // 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	1417 // the buffer.
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1418 buf[len++] = '\n';
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1419 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1420 else
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1421 {
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1422 // 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	1423 // in the buffer so arrange to have it returned on the next
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	1424 // call to octave_lexer::read.
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1425 pos = eol;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1426 chars_left = 1;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1427 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1428 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1429
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1430 return len;
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1431 }
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1432
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1433 octave_lexer::~octave_lexer (void)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1434 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1435 yylex_destroy (scanner);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1436 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1437
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1438 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1439 octave_lexer::init (void)
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1440 {
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1441 yylex_init (&scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1442
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1443 // Make octave_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	1444 // flex-generated lexer.
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1445 yyset_extra (this, scanner);
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	1446
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	1447 clear_start_state ();
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1448 }
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1449
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1450 // Inside Flex-generated functions, yyg is the scanner cast to its real
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	1451 // type. Some flex macros that we use in octave_lexer member functions
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	1452 // (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	1453 // 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	1454 // OCTAVE_YYG macro.
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1455
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1456 #define OCTAVE_YYG \
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1457 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	1458
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1459 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1460 octave_lexer::reset (void)
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1461 {
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1462 // 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	1463 clear_start_state ();
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1464
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1465 parser_symtab_context.clear ();
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1466
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1467 // 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	1468 promptflag (1);
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1469
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1470 // 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	1471 // input.
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1472
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1473 if (! quitting_gracefully
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1474 && (interactive \|\| forced_interactive)
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1475 && ! (reading_fcn_file
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1476 \|\| reading_classdef_file
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1477 \|\| reading_script_file
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1478 \|\| input_from_eval_string ()))
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1479 yyrestart (stdin, scanner);
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1480
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	1481 input_reader.reset ();
e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	1482
16194 b7ca669af528 reset lexical_feedback state before starting a new parse John W. Eaton <jwe@octave.org> parents: 16193 diff changeset	1483 lexical_feedback::reset ();
16123 a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1484 }
a484e39d1f22 maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16122 diff changeset	1485
16124 3be725cd195b move more lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16123 diff changeset	1486 void
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1487 octave_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	1488 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1489 reading_script_file = true;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1490
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	1491 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	1492 }
3be725cd195b move more lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16123 diff changeset	1493
16121 bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1494 int
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	1495 octave_lexer::read (char *buf, unsigned max_size)
16121 bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1496 {
bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1497 int status = 0;
bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1498
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1499 if (input_buf.empty ())
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	1500 {
b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	1501 bool eof = false;
16207 0467d68ca891 move current_input_line to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	1502 current_input_line = input_reader.get_input (eof);
0467d68ca891 move current_input_line to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	1503 input_buf.fill (current_input_line, eof);
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	1504 }
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1505
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1506 if (! input_buf.empty ())
359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1507 status = input_buf.copy_chunk (buf, max_size);
16121 bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1508 else
bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1509 {
bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1510 status = YY_NULL;
bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1511
16183 359d56094efa handle lexer input buffering with class John W. Eaton <jwe@octave.org> parents: 16166 diff changeset	1512 if (! input_buf.at_eof ())
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16194 diff changeset	1513 fatal_error ("octave_lexer::read () in flex scanner failed");
16121 bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1514 }
bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1515
bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1516 return status;
bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1517 }
bdf365c5c9bf maint: move function definition in lex.ll John W. Eaton <jwe@octave.org> parents: 16120 diff changeset	1518
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	1519 int
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1520 octave_lexer::handle_end_of_input (void)
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1521 {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1522 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	1523
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1524 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	1525 {
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1526 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	1527
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1528 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	1529 && ! 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	1530 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	1531 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	1532 }
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1533
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1534 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	1535 }
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1536
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	1537 char *
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1538 octave_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	1539 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1540 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	1541 }
210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	1542
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	1543 int
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1544 octave_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	1545 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1546 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	1547 }
421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	1548
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1549 // GAG.
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1550 //
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1551 // If we're reading a matrix and the next character is '[', make sure
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1552 // that we insert a comma ahead of it.
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1553
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1554 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1555 octave_lexer::do_comma_insert_check (void)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1556 {
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1557 bool spc_gobbled = (eat_continuation () != octave_lexer::NO_WHITESPACE);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1558
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1559 int c = text_yyinput ();
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1560
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1561 xunput (c);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1562
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1563 if (spc_gobbled)
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1564 xunput (' ');
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1565
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1566 do_comma_insert = (! looking_at_object_index.front ()
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1567 && bracketflag && c == '[');
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1568 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1569
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1570 int
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1571 octave_lexer::text_yyinput (void)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1572 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1573 int c = yyinput (scanner);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1574
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1575 if (lexer_debug_flag)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1576 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1577 std::cerr << "I: ";
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1578 display_character (c);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1579 std::cerr << std::endl;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1580 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1581
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1582 // 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	1583
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1584 if (c == '\r')
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1585 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1586 c = yyinput (scanner);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1587
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1588 if (lexer_debug_flag)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1589 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1590 std::cerr << "I: ";
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1591 display_character (c);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1592 std::cerr << std::endl;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1593 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1594
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1595 if (c != '\n')
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1596 {
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1597 xunput (c);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1598 c = '\n';
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1599 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1600 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1601
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1602 if (c == '\n')
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1603 input_line_number++;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1604
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1605 return c;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1606 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1607
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1608 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1609 octave_lexer::xunput (char c, char *buf)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1610 {
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	1611 if (c != EOF)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1612 {
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	1613 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	1614 {
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1615 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	1616 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	1617 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	1618 }
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1619
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1620 if (c == '\n')
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1621 input_line_number--;
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1622
c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1623 yyunput (c, buf, scanner);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1624 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1625 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1626
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1627 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1628 octave_lexer::xunput (char c)
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1629 {
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	1630 char *yytxt = flex_yytext ();
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	1631
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	1632 xunput (c, yytxt);
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1633 }
96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1634
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1635 // If we read some newlines, we need figure out what column we're
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1636 // really looking at.
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1637
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1638 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1639 octave_lexer::fixup_column_count (char *s)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1640 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1641 char c;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1642 while ((c = *s++) != '\0')
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1643 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1644 if (c == '\n')
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1645 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1646 input_line_number++;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1647 current_input_column = 1;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1648 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1649 else
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1650 current_input_column++;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1651 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1652 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1653
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1654 bool
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1655 octave_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	1656 {
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1657 bool retval = false;
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1658
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1659 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	1660 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	1661 {
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1662 if (*i)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1663 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1664 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1665 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1666 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1667 }
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1668
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1669 return retval;
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1670 }
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1671
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	1672 // 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	1673
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1674 int
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1675 octave_lexer::is_keyword_token (const std::string& s)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1676 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1677 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	1678 int c = current_input_column;
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: 3802 diff changeset	1679
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	1680 int len = s.length ();
922 708827b941b4 [project @ 1994-11-14 22:14:13 by jwe] jwe parents: 916 diff changeset	1681
5088 7830f271a53f [project @ 2004-12-01 19:54:45 by jwe] jwe parents: 5035 diff changeset	1682 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	1683
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1684 if (kw)
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 120 diff changeset	1685 {
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1686 token *tok_val = 0;
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1687
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1688 switch (kw->kw_id)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1689 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1690 case break_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1691 case catch_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1692 case continue_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1693 case else_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1694 case otherwise_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1695 case return_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1696 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	1697 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1698 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1699
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1700 case static_kw:
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1701 if ((reading_fcn_file \|\| reading_script_file
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1702 \|\| reading_classdef_file)
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1703 && ! fcn_file_full_name.empty ())
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1704 warning_with_id ("Octave:deprecated-keyword",
15468 6437fa7263dd use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	1705 "the 'static' keyword is obsolete and will be removed from a future version of Octave; please use 'persistent' instead; 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	1706 input_line_number,
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1707 fcn_file_full_name.c_str ());
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1708 else
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1709 warning_with_id ("Octave:deprecated-keyword",
15468 6437fa7263dd use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	1710 "the 'static' keyword is obsolete and will be removed from a future version of Octave; please use 'persistent' instead; near line %d",
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1711 input_line_number);
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1712 // fall through ...
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1713
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1714 case persistent_kw:
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1715 break;
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1716
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1717 case case_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1718 case elseif_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1719 case global_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1720 case until_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1721 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1722
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1723 case end_kw:
14645 cbc00b587f36 also allow "end" indexing in classdef files John W. Eaton <jwe@octave.org> parents: 14642 diff changeset	1724 if (inside_any_object_index ()
cbc00b587f36 also allow "end" indexing in classdef files John W. Eaton <jwe@octave.org> parents: 14642 diff changeset	1725 \|\| (! reading_classdef_file
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1726 && (defining_func
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1727 && ! (looking_at_return_list
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1728 \|\| parsed_function_name.top ()))))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1729 return 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1730
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1731 tok_val = new token (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	1732 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1733 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1734
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1735 case end_try_catch_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1736 tok_val = new token (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	1737 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1738 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1739
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1740 case end_unwind_protect_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1741 tok_val = new token (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	1742 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1743 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1744
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1745 case endfor_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1746 tok_val = new token (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	1747 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1748 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1749
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1750 case endfunction_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1751 tok_val = new token (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	1752 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1753 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1754
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1755 case endif_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1756 tok_val = new token (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	1757 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1758 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1759
13246 0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	1760 case endparfor_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1761 tok_val = new token (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	1762 at_beginning_of_statement = true;
13246 0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	1763 break;
0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	1764
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1765 case endswitch_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1766 tok_val = new token (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	1767 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1768 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1769
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1770 case endwhile_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1771 tok_val = new token (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	1772 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1773 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1774
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1775 case endclassdef_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1776 tok_val = new token (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	1777 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1778 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1779
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1780 case endenumeration_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1781 tok_val = new token (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	1782 at_beginning_of_statement = true;
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1783 break;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1784
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1785 case endevents_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1786 tok_val = new token (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	1787 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1788 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1789
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1790 case endmethods_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1791 tok_val = new token (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	1792 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1793 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1794
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1795 case endproperties_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1796 tok_val = new token (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	1797 at_beginning_of_statement = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1798 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1799
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	1800
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1801 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	1802 case parfor_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1803 case while_kw:
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	1804 decrement_promptflag ();
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1805 looping++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1806 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1807
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1808 case do_kw:
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1809 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	1810 decrement_promptflag ();
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1811 looping++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1812 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1813
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1814 case try_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1815 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	1816 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	1817 decrement_promptflag ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1818 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1819
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1820 case if_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1821 case switch_kw:
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	1822 decrement_promptflag ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1823 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1824
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1825 case get_kw:
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1826 case set_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1827 // 'get' and 'set' are keywords in classdef method
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1828 // declarations.
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1829 if (! maybe_classdef_get_set_method)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1830 return 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1831 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1832
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1833 case enumeration_kw:
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1834 case events_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1835 case methods_kw:
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1836 case properties_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1837 // 'properties', 'methods' and 'events' are keywords for
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1838 // classdef blocks.
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1839 if (! parsing_classdef)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1840 return 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1841 // fall through ...
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1842
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1843 case classdef_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1844 // '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	1845 decrement_promptflag ();
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1846
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1847 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	1848 {
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1849 reading_classdef_file = true;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1850 reading_script_file = false;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1851 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1852 break;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1853
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1854 case function_kw:
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	1855 decrement_promptflag ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1856
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1857 defining_func++;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1858 parsed_function_name.push (false);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1859
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1860 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	1861 {
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1862 reading_fcn_file = true;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1863 reading_script_file = false;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1864 }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1865
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1866 if (! (reading_fcn_file \|\| reading_script_file
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1867 \|\| reading_classdef_file))
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1868 input_line_number = 1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1869 break;
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1870
3174 390d5e396682 [project @ 1998-05-04 16:36:17 by jwe] jwe parents: 3165 diff changeset	1871 case magic_file_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1872 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1873 if ((reading_fcn_file \|\| reading_script_file
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1874 \|\| reading_classdef_file)
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1875 && ! fcn_file_full_name.empty ())
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1876 tok_val = new token (fcn_file_full_name, l, c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1877 else
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1878 tok_val = new token ("stdin", l, c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1879 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1880 break;
3174 390d5e396682 [project @ 1998-05-04 16:36:17 by jwe] jwe parents: 3165 diff changeset	1881
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe] jwe parents: 3165 diff changeset	1882 case magic_line_kw:
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1883 tok_val = new token (static_cast<double> (l), "", l, c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1884 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1885
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1886 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1887 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1888 }
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1889
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1890 if (! tok_val)
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1891 tok_val = new token (l, c);
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	1892
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	1893 push_token (tok_val);
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1894
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1895 return kw->tok;
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 120 diff changeset	1896 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1897
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1898 return 0;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1899 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1900
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1901 bool
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1902 octave_lexer::is_variable (const std::string& name)
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	1903 {
8001 ff9e7873f8ea improve handling of command-style names in matrix_or_assign_lhs context John W. Eaton <jwe@octave.org> parents: 7898 diff changeset	1904 return (symbol_table::is_variable (name)
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1905 \|\| (pending_local_variables.find (name)
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1906 != pending_local_variables.end ()));
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	1907 }
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	1908
3263 7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1909 // Recognize separators. If the separator is a CRLF pair, it is
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1910 // replaced by a single LF.
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1911
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1912 bool
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1913 octave_lexer::next_token_is_sep_op (void)
3263 7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1914 {
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1915 bool retval = false;
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1916
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	1917 int c = text_yyinput ();
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	1918
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	1919 retval = match_any (c, ",;\n]");
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	1920
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1921 xunput (c);
3263 7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1922
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1923 return retval;
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1924 }
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1925
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1926 // Try to determine if the next token should be treated as a postfix
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1927 // unary operator. This is ugly, but it seems to do the right thing.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1928
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1929 bool
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1930 octave_lexer::next_token_is_postfix_unary_op (bool spc_prev)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1931 {
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1932 bool un_op = false;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1933
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	1934 int c0 = text_yyinput ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1935
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1936 if (c0 == '\'' && ! spc_prev)
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1937 {
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1938 un_op = true;
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1939 }
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1940 else if (c0 == '.')
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1941 {
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	1942 int c1 = text_yyinput ();
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1943 un_op = (c1 == '\'');
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1944 xunput (c1);
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1945 }
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	1946 else if (c0 == '+')
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	1947 {
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	1948 int c1 = text_yyinput ();
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	1949 un_op = (c1 == '+');
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1950 xunput (c1);
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	1951 }
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	1952 else if (c0 == '-')
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	1953 {
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	1954 int c1 = text_yyinput ();
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	1955 un_op = (c1 == '-');
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1956 xunput (c1);
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	1957 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1958
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1959 xunput (c0);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1960
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1961 return un_op;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1962 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1963
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1964 // Try to determine if the next token should be treated as a binary
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1965 // operator.
1521 b3e4ca4f75a0 [project @ 1995-10-04 05:10:36 by jwe] jwe parents: 1520 diff changeset	1966 //
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1967 // This kluge exists because whitespace is not always ignored inside
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	1968 // the square brackets that are used to create matrix objects (though
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	1969 // spacing only really matters in the cases that can be interpreted
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	1970 // either as binary ops or prefix unary ops: currently just +, -).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	1971 //
3779 3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3774 diff changeset	1972 // Note that a line continuation directly following a + or - operator
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3774 diff changeset	1973 // (e.g., the characters '[' 'a' ' ' '+' '\' LFD 'b' ']') will be
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3774 diff changeset	1974 // parsed as a binary operator.
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1975
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1976 bool
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	1977 octave_lexer::next_token_is_bin_op (bool spc_prev)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1978 {
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1979 bool bin_op = false;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1980
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	1981 int c0 = text_yyinput ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1982
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1983 switch (c0)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1984 {
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 767 diff changeset	1985 case '+':
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 767 diff changeset	1986 case '-':
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	1987 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1988 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1989
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1990 switch (c1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1991 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1992 case '+':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1993 case '-':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1994 // Unary ops, spacing doesn't matter.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1995 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1996
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1997 case '=':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1998 // Binary ops, spacing doesn't matter.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1999 bin_op = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2000 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2001
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2002 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2003 // Could be either, spacing matters.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2004 bin_op = looks_like_bin_op (spc_prev, c1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2005 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2006 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2007
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2008 xunput (c1);
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2009 }
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2010 break;
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2011
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2012 case ':':
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2013 case '/':
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2014 case '\\':
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2015 case '^':
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2016 // Always a binary op (may also include /=, \=, and ^=).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2017 bin_op = true;
1276 cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe] jwe parents: 1273 diff changeset	2018 break;
cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe] jwe parents: 1273 diff changeset	2019
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2020 // .+ .- ./ .\ .^ .* .**
1554 b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe] jwe parents: 1521 diff changeset	2021 case '.':
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe] jwe parents: 1521 diff changeset	2022 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2023 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2024
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2025 if (match_any (c1, "+-/\\^*"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2026 // Always a binary op (may also include .+=, .-=, ./=, ...).
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2027 bin_op = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2028 else if (! isdigit (c1) && c1 != ' ' && c1 != '\t' && c1 != '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2029 // A structure element reference is a binary op.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2030 bin_op = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2031
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2032 xunput (c1);
1554 b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe] jwe parents: 1521 diff changeset	2033 }
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe] jwe parents: 1521 diff changeset	2034 break;
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe] jwe parents: 1521 diff changeset	2035
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2036 // = == & && \| \|\| * **
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2037 case '=':
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2038 case '&':
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2039 case '\|':
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2040 case '*':
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2041 // Always a binary op (may also include ==, &&, \|\|, **).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2042 bin_op = true;
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2043 break;
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2044
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2045 // < <= <> > >=
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2046 case '<':
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2047 case '>':
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2048 // Always a binary op (may also include <=, <>, >=).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2049 bin_op = true;
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2050 break;
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2051
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2052 // ~= !=
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 767 diff changeset	2053 case '~':
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 767 diff changeset	2054 case '!':
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2055 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2056 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2057
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2058 // ~ and ! can be unary ops, so require following =.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2059 if (c1 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2060 bin_op = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2061
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2062 xunput (c1);
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2063 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2064 break;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2065
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2066 default:
1276 cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe] jwe parents: 1273 diff changeset	2067 break;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2068 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2069
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2070 xunput (c0);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2071
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2072 return bin_op;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2073 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2074
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	2075 // FIXME -- we need to handle block comments here.
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	2076
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2077 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2078 octave_lexer::scan_for_comments (const char *text)
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2079 {
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2080 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2081
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2082 bool in_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2083 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2084
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2085 int len = strlen (text);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2086 int i = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2087
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2088 while (i < len)
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2089 {
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2090 char c = text[i++];
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2091
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2092 switch (c)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2093 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2094 case '%':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2095 case '#':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2096 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2097 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2098 if (! beginning_of_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2099 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2100 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2101 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2102 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2103 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2104 in_comment = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2105 beginning_of_comment = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2106 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2107 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2108
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2109 case '\n':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2110 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2111 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2112 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2113 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2114 comment_buf.resize (0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2115 in_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2116 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2117 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2118 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2119
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2120 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2121 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2122 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2123 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2124 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2125 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2126 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2127 }
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2128 }
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2129
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2130 if (! comment_buf.empty ())
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2131 octave_comment_buffer::append (comment_buf);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2132 }
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2133
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2134 // Discard whitespace, including comments and continuations.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2135
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	2136 // FIXME -- we need to handle block comments here.
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	2137
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2138 int
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2139 octave_lexer::eat_whitespace (void)
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2140 {
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2141 int retval = octave_lexer::NO_WHITESPACE;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2142
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2143 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2144
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2145 bool in_comment = false;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2146 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2147
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2148 int c = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2149
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	2150 while ((c = text_yyinput ()) != EOF)
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2151 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2152 current_input_column++;
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2153
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2154 switch (c)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2155 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2156 case ' ':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2157 case '\t':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2158 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2159 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2160 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2161 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2162 }
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2163 retval \|= octave_lexer::SPACE_OR_TAB;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2164 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2165
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2166 case '\n':
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2167 retval \|= octave_lexer::NEWLINE;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2168 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2169 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2170 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2171 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2172 comment_buf.resize (0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2173 in_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2174 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2175 }
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2176 current_input_column = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2177 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2178
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2179 case '#':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2180 case '%':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2181 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2182 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2183 if (! beginning_of_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2184 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2185 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2186 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2187 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2188 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2189 in_comment = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2190 beginning_of_comment = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2191 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2192 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2193
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2194 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2195 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2196 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2197 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2198 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2199 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2200 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2201 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2202 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2203 if (have_ellipsis_continuation ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2204 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2205 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2206 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2207 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2208
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2209 case '\\':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2210 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2211 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2212 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2213 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2214 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2215 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2216 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2217 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2218 if (have_continuation ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2219 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2220 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2221 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2222 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2223
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2224 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2225 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2226 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2227 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2228 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2229 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2230 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2231 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2232 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2233 }
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2234 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2235
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2236 if (! comment_buf.empty ())
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2237 octave_comment_buffer::append (comment_buf);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2238
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2239 done:
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2240 xunput (c);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2241 current_input_column--;
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2242 return retval;
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2243 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2244
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2245 static inline bool
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2246 looks_like_hex (const char *s, int len)
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2247 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2248 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	2249 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2250
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2251 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2252 octave_lexer::handle_number (void)
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2253 {
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2254 double value = 0.0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2255 int nread = 0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2256
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2257 char *yytxt = flex_yytext ();
210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2258
210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2259 if (looks_like_hex (yytxt, strlen (yytxt)))
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2260 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2261 unsigned long ival;
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2262
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2263 nread = sscanf (yytxt, "%lx", &ival);
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2264
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2265 value = static_cast<double> (ival);
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2266 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2267 else
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2268 {
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	2269 char *tmp = strsave (yytxt);
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2270
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2271 char *idx = strpbrk (tmp, "Dd");
2621 337a09dd1c06 [project @ 1997-01-24 21:49:41 by jwe] jwe parents: 2614 diff changeset	2272
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2273 if (idx)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2274 *idx = 'e';
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2275
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2276 nread = sscanf (tmp, "%lf", &value);
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2277
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2278 delete [] tmp;
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2279 }
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2280
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	2281 // 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	2282
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2283 assert (nread == 1);
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2284
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2285 quote_is_transpose = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2286 convert_spaces_to_comma = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2287 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	2288 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	2289
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	2290 push_token (new token (value, yytxt, input_line_number,
10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	2291 current_input_column));
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2292
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	2293 current_input_column += flex_yyleng ();
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2294
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2295 do_comma_insert_check ();
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2296 }
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2297
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2298 void
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2299 octave_lexer::handle_continuation (void)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2300 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2301 char *yytxt = flex_yytext ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2302 int yylng = flex_yyleng ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2303
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2304 size_t offset = 1;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2305 if (yytxt[0] == '\\')
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2306 gripe_matlab_incompatible_continuation ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2307 else
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2308 offset = 3;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2309
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2310 bool have_space = false;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2311 while (offset < yylng)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2312 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2313 char c = yytxt[offset];
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2314 if (c == ' ' \|\| c == '\t')
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2315 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2316 have_space = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2317 offset++;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2318 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2319 else
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2320 break;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2321 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2322
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2323 bool have_comment = false;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2324 while (offset < yylng)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2325 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2326 char c = yytxt[offset];
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2327 if (c == '#' \|\| c == '%')
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2328 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2329 have_comment = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2330 offset++;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2331 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2332 else
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2333 break;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2334 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2335
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2336 if (have_comment)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2337 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2338 comment_text = &yytxt[offset];
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2339
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2340 finish_comment (octave_comment_elt::end_of_line, true);
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2341 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2342
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2343 decrement_promptflag ();
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2344 input_line_number++;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2345 current_input_column = 1;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2346 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2347
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2348 void
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2349 octave_lexer::finish_comment (octave_comment_elt::comment_type typ,
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2350 bool looking_at_continuation)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2351 {
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2352 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	2353
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2354 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	2355 && ! comment_text.empty () && ! copyright)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2356 help_text = comment_text;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2357
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2358 if (copyright)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2359 typ = octave_comment_elt::copyright;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2360
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2361 octave_comment_buffer::append (comment_text, typ);
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2362
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2363 comment_text = "";
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2364
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2365 quote_is_transpose = false;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2366 convert_spaces_to_comma = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2367 at_beginning_of_statement = true;
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2368
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2369 if (! looking_at_continuation)
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2370 xunput ('\n');
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2371 }
a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	2372
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2373 // We have seen a backslash and need to find out if it should be
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2374 // treated as a continuation character. If so, this eats it, up to
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2375 // and including the new line character.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2376 //
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2377 // Match whitespace only, followed by a comment character or newline.
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2378 // Once a comment character is found, discard all input until newline.
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2379 // If non-whitespace characters are found before comment
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2380 // characters, return 0. Otherwise, return 1.
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2381
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	2382 // FIXME -- we need to handle block comments here.
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	2383
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2384 bool
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2385 octave_lexer::have_continuation (bool trailing_comments_ok)
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2386 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5615 diff changeset	2387 std::ostringstream buf;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2388
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2389 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2390
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2391 bool in_comment = false;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2392 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2393
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2394 int c = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2395
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	2396 while ((c = text_yyinput ()) != EOF)
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2397 {
3802 4f1a26a730fd [project @ 2001-02-26 20:26:14 by jwe] jwe parents: 3796 diff changeset	2398 buf << static_cast<char> (c);
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2399
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2400 switch (c)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2401 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2402 case ' ':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2403 case '\t':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2404 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2405 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2406 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2407 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2408 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2409 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2410
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2411 case '%':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2412 case '#':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2413 if (trailing_comments_ok)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2414 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2415 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2416 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2417 if (! beginning_of_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2418 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2419 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2420 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2421 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2422 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2423 in_comment = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2424 beginning_of_comment = true;
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 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2427 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2428 goto cleanup;
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 '\n':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2432 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2433 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2434 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2435 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2436 }
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2437 current_input_column = 0;
16209 e7ff32e7cf82 move global promptflag variable to octave_reader class John W. Eaton <jwe@octave.org> parents: 16207 diff changeset	2438 decrement_promptflag ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2439 gripe_matlab_incompatible_continuation ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2440 return true;
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 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2443 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2444 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2445 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2446 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2447 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2448 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2449 goto cleanup;
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 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2452 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2453
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2454 xunput (c);
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2455 return false;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2456
3096 ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe] jwe parents: 3079 diff changeset	2457 cleanup:
4051 b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe] jwe parents: 4037 diff changeset	2458
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5615 diff changeset	2459 std::string s = buf.str ();
4051 b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe] jwe parents: 4037 diff changeset	2460
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe] jwe parents: 4037 diff changeset	2461 int len = s.length ();
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe] jwe parents: 4037 diff changeset	2462 while (len--)
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2463 xunput (s[len]);
3096 ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe] jwe parents: 3079 diff changeset	2464
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2465 return false;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2466 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2467
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	2468 // We have seen a '.' and need to see if it is the start of a
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2469 // continuation. If so, this eats it, up to and including the new
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2470 // line character.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2471
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2472 bool
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2473 octave_lexer::have_ellipsis_continuation (bool trailing_comments_ok)
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2474 {
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	2475 char c1 = text_yyinput ();
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2476 if (c1 == '.')
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2477 {
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	2478 char c2 = text_yyinput ();
1091 54abf1b3a8e9 [project @ 1995-02-02 00:30:14 by jwe] jwe parents: 1088 diff changeset	2479 if (c2 == '.' && have_continuation (trailing_comments_ok))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2480 return true;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2481 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2482 {
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2483 xunput (c2);
96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2484 xunput (c1);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2485 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2486 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2487 else
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2488 xunput (c1);
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2489
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2490 return false;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2491 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2492
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2493 // See if we have a continuation line. If so, eat it and the leading
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2494 // whitespace on the next line.
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	2495
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2496 int
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2497 octave_lexer::eat_continuation (void)
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2498 {
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2499 int retval = octave_lexer::NO_WHITESPACE;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2500
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	2501 int c = text_yyinput ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2502
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2503 if ((c == '.' && have_ellipsis_continuation ())
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3103 diff changeset	2504 \|\| (c == '\\' && have_continuation ()))
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2505 retval = eat_whitespace ();
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2506 else
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2507 xunput (c);
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2508
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2509 return retval;
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2510 }
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2511
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2512 int
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2513 octave_lexer::handle_string (char delim)
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2514 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5615 diff changeset	2515 std::ostringstream buf;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2516
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2517 int bos_line = input_line_number;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2518 int bos_col = current_input_column;
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: 3802 diff changeset	2519
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2520 int c;
1031 59f5eb2d5eb3 [project @ 1995-01-15 21:11:11 by jwe] jwe parents: 1019 diff changeset	2521 int escape_pending = 0;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2522
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	2523 while ((c = text_yyinput ()) != EOF)
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2524 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2525 current_input_column++;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2526
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3103 diff changeset	2527 if (c == '\\')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2528 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2529 if (delim == '\'' \|\| escape_pending)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2530 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2531 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2532 escape_pending = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2533 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2534 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2535 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2536 if (have_continuation (false))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2537 escape_pending = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2538 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2539 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2540 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2541 escape_pending = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2542 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2543 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2544 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2545 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2546 else if (c == '.')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2547 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2548 if (delim == '\'' \|\| ! have_ellipsis_continuation (false))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2549 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2550 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2551 else if (c == '\n')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2552 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2553 error ("unterminated string constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2554 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2555 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2556 else if (c == delim)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2557 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2558 if (escape_pending)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2559 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2560 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2561 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2562 c = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2563 if (c == delim)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2564 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2565 buf << static_cast<char> (c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2566 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2567 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2568 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2569 std::string s;
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2570 xunput (c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2571
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2572 if (delim == '\'')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2573 s = buf.str ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2574 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2575 s = do_string_escapes (buf.str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2576
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2577 quote_is_transpose = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2578 convert_spaces_to_comma = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2579
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	2580 push_token (new token (s, bos_line, bos_col));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2581
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2582 if (delim == '"')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2583 gripe_matlab_incompatible ("\" used as string delimiter");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2584 else if (delim == '\'')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2585 gripe_single_quote_string ();
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	2586
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2587 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	2588 at_beginning_of_statement = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2589
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2590 return delim == '"' ? DQ_STRING : SQ_STRING;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2591 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2592 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2593 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2594 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2595 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2596 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2597 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2598
1031 59f5eb2d5eb3 [project @ 1995-01-15 21:11:11 by jwe] jwe parents: 1019 diff changeset	2599 escape_pending = 0;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2600 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2601
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2602 return LEXICAL_ERROR;
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2603 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2604
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2605 bool
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2606 octave_lexer::next_token_is_assign_op (void)
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2607 {
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2608 bool retval = false;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2609
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	2610 int c0 = text_yyinput ();
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2611
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2612 switch (c0)
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2613 {
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2614 case '=':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2615 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2616 int c1 = text_yyinput ();
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2617 xunput (c1);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2618 if (c1 != '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2619 retval = true;
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2620 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2621 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2622
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2623 case '+':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2624 case '-':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2625 case '*':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2626 case '/':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2627 case '\\':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2628 case '&':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2629 case '\|':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2630 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2631 int c1 = text_yyinput ();
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2632 xunput (c1);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2633 if (c1 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2634 retval = true;
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2635 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2636 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2637
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2638 case '.':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2639 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2640 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2641 if (match_any (c1, "+-*/\\"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2642 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2643 int c2 = text_yyinput ();
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2644 xunput (c2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2645 if (c2 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2646 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2647 }
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2648 xunput (c1);
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2649 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2650 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2651
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2652 case '>':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2653 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2654 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2655 if (c1 == '>')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2656 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2657 int c2 = text_yyinput ();
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2658 xunput (c2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2659 if (c2 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2660 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2661 }
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2662 xunput (c1);
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2663 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2664 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2665
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2666 case '<':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2667 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2668 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2669 if (c1 == '<')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2670 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2671 int c2 = text_yyinput ();
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2672 xunput (c2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2673 if (c2 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2674 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2675 }
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2676 xunput (c1);
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2677 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2678 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2679
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2680 default:
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2681 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2682 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2683
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2684 xunput (c0);
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2685
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2686 return retval;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2687 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2688
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2689 bool
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2690 octave_lexer::next_token_is_index_op (void)
4633 d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2691 {
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	2692 int c = text_yyinput ();
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2693 xunput (c);
4633 d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2694 return c == '(' \|\| c == '{';
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2695 }
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2696
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2697 int
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2698 octave_lexer::handle_close_bracket (bool spc_gobbled, int bracket_type)
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2699 {
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4608 diff changeset	2700 int retval = bracket_type;
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2701
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2702 if (! nesting_level.none ())
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2703 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2704 nesting_level.remove ();
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2705
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2706 if (bracket_type == ']')
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2707 bracketflag--;
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2708 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	2709 braceflag--;
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2710 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2711 panic_impossible ();
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2712 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2713
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	2714 pop_start_state ();
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2715
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	2716 if (bracket_type == ']'
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	2717 && next_token_is_assign_op ()
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2718 && ! looking_at_return_list)
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2719 {
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2720 retval = CLOSE_BRACE;
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2721 }
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2722 else if ((bracketflag \|\| braceflag)
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2723 && convert_spaces_to_comma
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2724 && (nesting_level.is_bracket ()
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2725 \|\| (nesting_level.is_brace ()
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2726 && ! looking_at_object_index.front ())))
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2727 {
4633 d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2728 bool index_op = next_token_is_index_op ();
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2729
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2730 // Don't insert comma if we are looking at something like
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2731 //
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2732 // [x{i}{j}] or [x{i}(j)]
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2733 //
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2734 // but do if we are looking at
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2735 //
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2736 // [x{i} {j}] or [x{i} (j)]
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2737
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2738 if (spc_gobbled \|\| ! (bracket_type == '}' && index_op))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2739 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2740 bool bin_op = next_token_is_bin_op (spc_gobbled);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2741
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2742 bool postfix_un_op = next_token_is_postfix_unary_op (spc_gobbled);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2743
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2744 bool sep_op = next_token_is_sep_op ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2745
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2746 if (! (postfix_un_op \|\| bin_op \|\| sep_op))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2747 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2748 maybe_warn_separator_insert (',');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2749
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2750 xunput (',');
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2751 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2752 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2753 }
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2754 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2755
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2756 quote_is_transpose = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2757 convert_spaces_to_comma = true;
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2758
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2759 return retval;
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2760 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2761
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2762 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2763 octave_lexer::maybe_unput_comma (int spc_gobbled)
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2764 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2765 if (nesting_level.is_bracket ()
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2766 \|\| (nesting_level.is_brace ()
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2767 && ! looking_at_object_index.front ()))
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2768 {
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2769 int bin_op = next_token_is_bin_op (spc_gobbled);
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2770
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2771 int postfix_un_op = next_token_is_postfix_unary_op (spc_gobbled);
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2772
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	2773 int c1 = text_yyinput ();
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	2774 int c2 = text_yyinput ();
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	2775
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2776 xunput (c2);
96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2777 xunput (c1);
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	2778
3263 7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	2779 int sep_op = next_token_is_sep_op ();
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	2780
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2781 int dot_op = (c1 == '.'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2782 && (isalpha (c2) \|\| isspace (c2) \|\| c2 == '_'));
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	2783
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	2784 if (postfix_un_op \|\| bin_op \|\| sep_op \|\| dot_op)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2785 return;
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	2786
3985 fa0ae9105656 [project @ 2002-07-11 04:02:00 by jwe] jwe parents: 3974 diff changeset	2787 int index_op = (c1 == '(' \|\| c1 == '{');
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	2788
4476 b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2789 // If there is no space before the indexing op, we don't insert
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2790 // a comma.
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2791
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2792 if (index_op && ! spc_gobbled)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2793 return;
4476 b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2794
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2795 maybe_warn_separator_insert (',');
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2796
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2797 xunput (',');
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2798 }
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2799 }
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2800
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2801 bool
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2802 octave_lexer::next_token_can_follow_bin_op (void)
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2803 {
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2804 std::stack<char> buf;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2805
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2806 int c = EOF;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2807
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2808 // Skip whitespace in current statement on current line
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2809 while (true)
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2810 {
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2811 c = text_yyinput ();
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2812
8767 026c6732ec7a lex.l (next_token_can_follow_bin_op): push all characters read on to buffer stack John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2813 buf.push (c);
026c6732ec7a lex.l (next_token_can_follow_bin_op): push all characters read on to buffer stack John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2814
026c6732ec7a lex.l (next_token_can_follow_bin_op): push all characters read on to buffer stack John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2815 if (match_any (c, ",;\n") \|\| (c != ' ' && c != '\t'))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2816 break;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2817 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2818
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2819 // Restore input.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2820 while (! buf.empty ())
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2821 {
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2822 xunput (buf.top ());
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2823
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2824 buf.pop ();
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2825 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2826
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2827 return (isalnum (c) \|\| match_any (c, "!\"'(-[_{~"));
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2828 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2829
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2830 static bool
10052 5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2831 can_be_command (const std::string& tok)
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2832 {
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2833 // Don't allow these names to be treated as commands to avoid
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2834 // surprises when parsing things like "NaN ^2".
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2835
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2836 return ! (tok == "e"
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2837 \|\| tok == "I" \|\| tok == "i"
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2838 \|\| tok == "J" \|\| tok == "j"
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2839 \|\| tok == "Inf" \|\| tok == "inf"
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2840 \|\| tok == "NaN" \|\| tok == "nan");
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2841 }
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2842
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	2843 bool
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	2844 octave_lexer::looks_like_command_arg (void)
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2845 {
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2846 bool retval = true;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2847
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2848 int c0 = text_yyinput ();
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2849
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2850 switch (c0)
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2851 {
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2852 // = ==
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2853 case '=':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2854 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2855 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2856
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2857 if (c1 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2858 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2859 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2860
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2861 if (! match_any (c2, ",;\n") && (c2 == ' ' \|\| c2 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2862 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2863 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2864
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2865 xunput (c2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2866 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2867 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2868 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2869
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2870 xunput (c1);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2871 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2872 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2873
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2874 case '(':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2875 case '{':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2876 // Indexing.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2877 retval = false;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2878 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2879
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2880 case '\n':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2881 // EOL.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2882 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2883
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2884 case '\'':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2885 case '"':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2886 // Beginning of a character string.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2887 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2888
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2889 // + - ++ -- += -=
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2890 case '+':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2891 case '-':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2892 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2893 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2894
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2895 switch (c1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2896 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2897 case '\n':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2898 // EOL.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2899 case '+':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2900 case '-':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2901 // Unary ops, spacing doesn't matter.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2902 break;
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 case '\t':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2905 case ' ':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2906 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2907 if (next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2908 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2909 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2910 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2911
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2912 case '=':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2913 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2914 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2915
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2916 if (! match_any (c2, ",;\n") && (c2 == ' ' \|\| c2 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2917 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2918 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2919
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2920 xunput (c2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2921 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2922 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2923 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2924
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2925 xunput (c1);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2926 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2927 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2928
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2929 case ':':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2930 case '/':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2931 case '\\':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2932 case '^':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2933 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2934 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2935
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2936 if (! match_any (c1, ",;\n") && (c1 == ' ' \|\| c1 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2937 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2938 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2939
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2940 xunput (c1);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2941 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2942 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2943
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2944 // .+ .- ./ .\ .^ .* .**
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2945 case '.':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2946 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2947 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2948
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2949 if (match_any (c1, "+-/\\^*"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2950 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2951 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2952
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2953 if (c2 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2954 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2955 int c3 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2956
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2957 if (! match_any (c3, ",;\n") && (c3 == ' ' \|\| c3 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2958 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2959 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2960
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2961 xunput (c3);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2962 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2963 else if (! match_any (c2, ",;\n") && (c2 == ' ' \|\| c2 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2964 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2965 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2966
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2967 xunput (c2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2968 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2969 else if (! match_any (c1, ",;\n")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2970 && (! isdigit (c1) && c1 != ' ' && c1 != '\t'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2971 && c1 != '.'))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2972 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2973 // Structure reference. FIXME -- is this a complete check?
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2974
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2975 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2976 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2977
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2978 xunput (c1);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2979 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2980 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2981
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2982 // & && \| \|\| * **
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2983 case '&':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2984 case '\|':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2985 case '*':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2986 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2987 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2988
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2989 if (c1 == c0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2990 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2991 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2992
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2993 if (! match_any (c2, ",;\n") && (c2 == ' ' \|\| c2 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2994 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2995 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2996
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	2997 xunput (c2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2998 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2999 else if (! match_any (c1, ",;\n") && (c1 == ' ' \|\| c1 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3000 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3001 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3002
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	3003 xunput (c1);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3004 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3005 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3006
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3007 // < <= > >=
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3008 case '<':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3009 case '>':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3010 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3011 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3012
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3013 if (c1 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3014 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3015 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3016
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3017 if (! match_any (c2, ",;\n") && (c2 == ' ' \|\| c2 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3018 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3019 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3020
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	3021 xunput (c2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3022 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3023 else if (! match_any (c1, ",;\n") && (c1 == ' ' \|\| c1 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3024 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3025 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3026
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	3027 xunput (c1);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3028 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3029 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3030
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3031 // ~= !=
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3032 case '~':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3033 case '!':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3034 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3035 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3036
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3037 // ~ and ! can be unary ops, so require following =.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3038 if (c1 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3039 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3040 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3041
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3042 if (! match_any (c2, ",;\n") && (c2 == ' ' \|\| c2 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3043 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3044 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3045
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	3046 xunput (c2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3047 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3048 else if (! match_any (c1, ",;\n") && (c1 == ' ' \|\| c1 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3049 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3050 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3051
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	3052 xunput (c1);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3053 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3054 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3055
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3056 default:
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3057 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3058 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3059
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	3060 xunput (c0);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3061
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3062 return retval;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3063 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3064
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3065 int
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3066 octave_lexer::handle_superclass_identifier (void)
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3067 {
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	3068 char *yytxt = flex_yytext ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	3069 int c = yytxt[flex_yyleng()-1];
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	3070
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	3071 std::string meth = strip_trailing_whitespace (yytxt);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3072
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3073 int cont_is_spc = eat_continuation ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3074
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3075 int spc_gobbled = (cont_is_spc \|\| c == ' ' \|\| c == '\t');
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3076
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3077 size_t pos = meth.find ("@");
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3078 std::string cls = meth.substr (pos + 1);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3079 meth = meth.substr (0, pos);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3080
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3081 std::string pkg;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3082 pos = cls.find (".");
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3083 if (pos != std::string::npos)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3084 {
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3085 pkg = cls.substr (0, pos);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3086 cls = cls.substr (pos + 1);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3087 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3088
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3089 int kw_token = (is_keyword_token (meth) \|\| is_keyword_token (cls)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3090 \|\| is_keyword_token (pkg));
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3091 if (kw_token)
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3092 {
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3093 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	3094 return LEXICAL_ERROR;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3095 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3096
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	3097 push_token (new token (meth, pkg, cls, input_line_number,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	3098 current_input_column));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3099
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3100 do_comma_insert_check ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3101 maybe_unput_comma (spc_gobbled);
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3102 current_input_column += flex_yyleng ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3103
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3104 return SUPERCLASSREF;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3105 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3106
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3107 int
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3108 octave_lexer::handle_meta_identifier (void)
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3109 {
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	3110 char *yytxt = flex_yytext ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	3111 int c = yytxt[flex_yyleng()-1];
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	3112
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	3113 std::string cls = strip_trailing_whitespace (yytxt).substr (1);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3114
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3115 int cont_is_spc = eat_continuation ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3116
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3117 int spc_gobbled = (cont_is_spc \|\| c == ' ' \|\| c == '\t');
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3118
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3119 std::string pkg;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3120 size_t pos = cls.find (".");
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3121 if (pos != std::string::npos)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3122 {
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3123 pkg = cls.substr (0, pos);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3124 cls = cls.substr (pos + 1);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3125 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3126
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3127 int kw_token = is_keyword_token (cls) \|\| is_keyword_token (pkg);
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3128 if (kw_token)
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3129 {
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3130 error ("class and package names may not be keywords");
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3131 return LEXICAL_ERROR;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3132 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3133
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	3134 push_token (new token (pkg, cls, input_line_number,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15576 16154 diff changeset	3135 current_input_column));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3136
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3137 do_comma_insert_check ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14647 diff changeset	3138 maybe_unput_comma (spc_gobbled);
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3139 current_input_column += flex_yyleng ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3140
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3141 return METAQUERY;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3142 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3143
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	3144 // 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	3145 // an identifier. Handles keywords. Return -1 if the identifier
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	3146 // should be ignored.
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	3147
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3148 int
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3149 octave_lexer::handle_identifier (void)
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3150 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3151 bool at_bos = at_beginning_of_statement;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3152
16128 210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	3153 char *yytxt = flex_yytext ();
210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	3154
210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	3155 std::string tok = strip_trailing_whitespace (yytxt);
210039e91ad6 localize use of yytext with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16126 diff changeset	3156
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3157 int c = yytxt[flex_yyleng()-1];
3974 e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	3158
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3159 bool cont_is_spc = (eat_continuation () != octave_lexer::NO_WHITESPACE);
3974 e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	3160
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	3161 int spc_gobbled = (cont_is_spc \|\| c == ' ' \|\| c == '\t');
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	3162
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3163 // If we are expecting a structure element, avoid recognizing
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3164 // 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	3165 // 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	3166 // decide whether to insert a comma.
747 6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe] jwe parents: 661 diff changeset	3167
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3168 if (looking_at_indirect_ref)
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	3169 {
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3170 do_comma_insert_check ();
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3171
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	3172 maybe_unput_comma (spc_gobbled);
2819 ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe] jwe parents: 2804 diff changeset	3173
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3174 push_token (new token (tok, input_line_number,
10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3175 current_input_column));
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3176
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3177 quote_is_transpose = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3178 convert_spaces_to_comma = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3179 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	3180
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3181 current_input_column += flex_yyleng ();
2819 ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe] jwe parents: 2804 diff changeset	3182
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3183 return STRUCT_ELT;
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	3184 }
747 6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe] jwe parents: 661 diff changeset	3185
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3186 at_beginning_of_statement = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3187
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3188 // The is_keyword_token may reset
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3189 // at_beginning_of_statement. For example, if it sees
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3190 // an else token, then the next token is at the beginning of a
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3191 // statement.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3192
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3193 int kw_token = is_keyword_token (tok);
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3194
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3195 // If we found a keyword token, then the beginning_of_statement flag
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3196 // is already set. Otherwise, we won't be at the beginning of a
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3197 // statement.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3198
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3199 if (looking_at_function_handle)
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3200 {
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3201 if (kw_token)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3202 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3203 error ("function handles may not refer to keywords");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3204
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3205 return LEXICAL_ERROR;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3206 }
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3207 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3208 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3209 push_token (new token (tok, input_line_number,
10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3210 current_input_column));
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3211
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3212 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	3213 quote_is_transpose = false;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3214 convert_spaces_to_comma = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3215 looking_for_object_index = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3216
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3217 return FCN_HANDLE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3218 }
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3219 }
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3220
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	3221 // 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	3222 // Keywords can be followed by identifiers.
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3223
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3224 if (kw_token)
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3225 {
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3226 if (kw_token >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3227 {
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3228 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	3229 quote_is_transpose = false;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3230 convert_spaces_to_comma = true;
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3231 looking_for_object_index = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3232 }
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3233
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3234 return kw_token;
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3235 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3236
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	3237 // See if we have a plot keyword (title, using, with, or clear).
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3238
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	3239 int c1 = text_yyinput ();
3480 45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3240
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3241 bool next_tok_is_eq = false;
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3242 if (c1 == '=')
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3243 {
7728 13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	3244 int c2 = text_yyinput ();
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	3245 xunput (c2);
3480 45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3246
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3247 if (c2 != '=')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3248 next_tok_is_eq = true;
3480 45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3249 }
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3250
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	3251 xunput (c1);
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	3252
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3253 // Kluge alert.
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3254 //
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3255 // If we are looking at a text style function, set up to gobble its
2745 76411ce43c05 [project @ 1997-02-26 07:52:14 by jwe] jwe parents: 2716 diff changeset	3256 // arguments.
76411ce43c05 [project @ 1997-02-26 07:52:14 by jwe] jwe parents: 2716 diff changeset	3257 //
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3258 // If the following token is '=', or if we are parsing a function
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	3259 // return list or function parameter list, or if we are looking at
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	3260 // something like [ab,cd] = foo (), force the symbol to be inserted
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3180 diff changeset	3261 // as a variable in the current symbol table.
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3262
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3263 if (! is_variable (tok))
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3264 {
10052 5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	3265 if (at_bos && spc_gobbled && can_be_command (tok)
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	3266 && looks_like_command_arg ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3267 {
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3268 push_start_state (COMMAND_START);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3269 }
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3270 else if (next_tok_is_eq
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3271 \|\| looking_at_decl_list
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3272 \|\| looking_at_return_list
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3273 \|\| (looking_at_parameter_list
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3274 && ! looking_at_initializer_expression))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3275 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3276 symbol_table::force_variable (tok);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3277 }
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3278 else if (looking_at_matrix_or_assign_lhs)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3279 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3280 pending_local_variables.insert (tok);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3281 }
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3282 }
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3283
4234 90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe] jwe parents: 4233 diff changeset	3284 // Find the token in the symbol table. Beware the magic
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe] jwe parents: 4233 diff changeset	3285 // transformation of the end keyword...
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe] jwe parents: 4233 diff changeset	3286
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe] jwe parents: 4233 diff changeset	3287 if (tok == "end")
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3288 tok = "__end__";
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3289
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3290 push_token (new token (&(symbol_table::insert (tok)),
10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3291 input_line_number, current_input_column));
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3292
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	3293 // After seeing an identifer, it is ok to convert spaces to a comma
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	3294 // (if needed).
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3295
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3296 convert_spaces_to_comma = true;
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3297
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3298 if (! (next_tok_is_eq \|\| start_state () == COMMAND_START))
2877 5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe] jwe parents: 2861 diff changeset	3299 {
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3300 quote_is_transpose = true;
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3301
2877 5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe] jwe parents: 2861 diff changeset	3302 do_comma_insert_check ();
5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe] jwe parents: 2861 diff changeset	3303
5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe] jwe parents: 2861 diff changeset	3304 maybe_unput_comma (spc_gobbled);
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3305 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3306
16130 421dea028bbf localize use of yyleng with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16129 diff changeset	3307 current_input_column += flex_yyleng ();
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3308
9324 29563379fa9b don't look for object index after keyword John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	3309 if (tok != "__end__")
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3310 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	3311
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3312 return NAME;
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3313 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3314
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3315 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3316 octave_lexer::maybe_warn_separator_insert (char sep)
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3317 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3318 std::string nm = fcn_file_full_name;
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3319
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3320 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3321 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	3322 "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	3323 sep, input_line_number);
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3324 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3325 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	3326 "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	3327 sep, input_line_number, nm.c_str ());
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3328 }
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3329
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3330 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3331 octave_lexer::gripe_single_quote_string (void)
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3332 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3333 std::string nm = fcn_file_full_name;
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3334
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3335 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3336 warning_with_id ("Octave:single-quote-string",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3337 "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	3338 input_line_number);
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3339 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3340 warning_with_id ("Octave:single-quote-string",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3341 "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	3342 input_line_number, nm.c_str ());
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3343 }
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3344
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3345 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3346 octave_lexer::gripe_matlab_incompatible (const std::string& msg)
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3347 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3348 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	3349
fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3350 if (nm.empty ())
fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3351 warning_with_id ("Octave:matlab-incompatible",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3352 "potential Matlab compatibility problem: %s",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3353 msg.c_str ());
8974 fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3354 else
fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3355 warning_with_id ("Octave:matlab-incompatible",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3356 "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	3357 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	3358 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3359
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3360 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3361 octave_lexer::maybe_gripe_matlab_incompatible_comment (char c)
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3362 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3363 if (c == '#')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3364 gripe_matlab_incompatible ("# used as comment character");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3365 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3366
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3367 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3368 octave_lexer::gripe_matlab_incompatible_continuation (void)
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3369 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3370 gripe_matlab_incompatible ("\\ used as line continuation marker");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3371 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3372
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	3373 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3374 octave_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	3375 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3376 std::string t = op;
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3377 int n = t.length ();
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3378 if (t[n-1] == '\n')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3379 t.resize (n-1);
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3380 gripe_matlab_incompatible (t + " used as operator");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3381 }
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3382
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3383 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3384 octave_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	3385 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3386 YYSTYPE *lval = yyget_lval (scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3387 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	3388 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	3389 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3390
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3391 token *
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3392 octave_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	3393 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3394 YYSTYPE *lval = yyget_lval (scanner);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3395 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	3396 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3397
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3398 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3399 octave_lexer::display_token (int tok)
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3400 {
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3401 switch (tok)
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3402 {
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3403 case '=': std::cerr << "'='\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3404 case ':': std::cerr << "':'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3405 case '-': std::cerr << "'-'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3406 case '+': std::cerr << "'+'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3407 case '': std::cerr << "''\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3408 case '/': std::cerr << "'/'\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3409 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	3410 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	3411 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	3412 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	3413 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	3414 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	3415 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	3416 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	3417 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	3418 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	3419 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	3420 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	3421 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	3422 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	3423 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	3424 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	3425 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	3426 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	3427 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	3428 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	3429 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	3430 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	3431 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	3432 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	3433 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	3434 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	3435 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	3436 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	3437 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	3438 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	3439 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	3440 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	3441 case EMINUS: std::cerr << "EMINUS\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3442 case QUOTE: std::cerr << "QUOTE\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3443 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	3444 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	3445 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	3446 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	3447 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	3448
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3449 case NUM:
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3450 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	3451 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3452 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	3453 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	3454 << " [" << 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	3455 }
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3456 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3457
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3458 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	3459 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3460 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	3461 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	3462 }
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3463 break;
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3464
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3465 case NAME:
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3466 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3467 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	3468 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	3469 std::cerr << "NAME";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3470 if (sr)
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3471 std::cerr << " [" << sr->name () << "]";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3472 std::cerr << "\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3473 }
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3474 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3475
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3476 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	3477
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3478 case DQ_STRING:
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3479 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	3480 {
16148 10abbc493f50 delete unnecessary X-> references inside class X member functions John W. Eaton <jwe@octave.org> parents: 16146 diff changeset	3481 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	3482
5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3483 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	3484 << " [" << 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	3485 }
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3486 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3487
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3488 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	3489 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	3490 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	3491 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	3492 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	3493 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	3494 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	3495 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	3496 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	3497 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	3498 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	3499 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	3500 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	3501 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	3502 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	3503 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	3504 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	3505 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	3506 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	3507 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	3508 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	3509 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	3510 case FCN: std::cerr << "FCN\n"; break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3511 case CLOSE_BRACE: std::cerr << "CLOSE_BRACE\n"; break;
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3512 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	3513 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	3514 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	3515 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	3516 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	3517 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	3518 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	3519 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	3520 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	3521 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	3522 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	3523 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	3524 default:
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3525 {
16166 cb80b1d062b1 don't attempt to print unprintable tokens John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	3526 if (tok < 256 && tok > 31)
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3527 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	3528 else
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3529 std::cerr << "UNKNOWN(" << tok << ")\n";
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3530 }
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3531 break;
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3532 }
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3533 }
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3534
b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3535 void
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16154 diff changeset	3536 octave_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	3537 {
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3538 error (msg);
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3539
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3540 OCTAVE_QUIT;
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3541
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	3542 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	3543 }
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3544
053b0364b507 localize use of yy_fatal_error with lexical_feedback member function John W. Eaton <jwe@octave.org> parents: 16128 diff changeset	3545 void
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3546 octave_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	3547 {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3548 if (lexer_debug_flag)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3549 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3550 std::cerr << std::endl;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3551
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3552 display_start_state ();
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3553
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3554 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	3555 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	3556 }
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3557 }
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3558
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3559 void
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3560 octave_lexer::push_start_state (int state)
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3561 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3562 OCTAVE_YYG;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3563
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3564 start_state_stack.push (state);
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3565
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3566 BEGIN (start_state ());
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3567 }
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3568
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3569 void
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3570 octave_lexer::pop_start_state (void)
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3571 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3572 OCTAVE_YYG;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3573
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3574 start_state_stack.pop ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3575
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3576 BEGIN (start_state ());
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3577 }
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3578
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3579 void
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3580 octave_lexer::clear_start_state (void)
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3581 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3582 while (! start_state_stack.empty ())
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3583 start_state_stack.pop ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3584
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3585 push_start_state (INITIAL);
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3586 }
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3587
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3588 void
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3589 octave_lexer::display_start_state (void) const
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3590 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3591 std::cerr << "S: ";
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3592
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3593 switch (start_state ())
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3594 {
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3595 case INITIAL:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3596 std::cerr << "INITIAL" << std::endl;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3597 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3598
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3599 case COMMAND_START:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3600 std::cerr << "COMMAND_START" << std::endl;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3601 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3602
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3603 case MATRIX_START:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3604 std::cerr << "MATRIX_START" << std::endl;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3605 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3606
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3607 case INPUT_FILE_START:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3608 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	3609 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3610
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3611 case BLOCK_COMMENT_START:
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3612 std::cerr << "BLOCK_COMMENT_START" << std::endl;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3613 break;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3614
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3615 case LINE_COMMENT_START:
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3616 std::cerr << "LINE_COMMENT_START" << std::endl;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3617 break;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	3618
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3619 default:
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3620 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	3621 break;
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3622 }
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3623 }
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3624
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3625 int
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3626 octave_lexer::handle_op (const char *pattern, int tok, bool convert,
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3627 bool bos, bool qit)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3628 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3629 return handle_op_internal (pattern, tok, convert, bos, qit, true);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3630 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3631
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3632 int
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3633 octave_lexer::handle_incompatible_op (const char *pattern, int tok,
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3634 bool convert, bool bos, bool qit)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3635 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3636 return handle_op_internal (pattern, tok, convert, bos, qit, false);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3637 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3638
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3639 int
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3640 octave_lexer::handle_op_internal (const char *pattern, int tok, bool convert,
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3641 bool bos, bool qit, bool compat)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3642 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3643 lexer_debug (pattern);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3644
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3645 if (! compat)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3646 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	3647
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3648 push_token (new token (input_line_number, current_input_column));
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3649
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3650 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	3651 quote_is_transpose = qit;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3652 convert_spaces_to_comma = convert;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3653 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	3654 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	3655
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3656 return count_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3657 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3658
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3659 int
16231 2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3660 octave_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	3661 {
16231 2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3662 token *tok_val = new token (name, input_line_number, current_input_column);
2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3663
2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3664 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	3665 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3666
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3667 int
16231 2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3668 octave_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	3669 {
16231 2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3670 if (! tok_val)
2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3671 tok_val = new token (input_line_number, current_input_column);
2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3672
2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3673 push_token (tok_val);
2b15ae55c721 put all tokens in the token cache John W. Eaton <jwe@octave.org> parents: 16230 diff changeset	3674
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3675 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	3676 quote_is_transpose = false;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3677 convert_spaces_to_comma = true;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3678
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3679 return count_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3680 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3681
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3682 int
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3683 octave_lexer::count_token (int tok)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3684 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3685 if (tok != '\n')
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3686 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3687 Vtoken_count++;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3688 token_count++;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3689 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3690
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3691 return show_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3692 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3693
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3694 int
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3695 octave_lexer::show_token (int tok)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3696 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3697 if (Vdisplay_tokens)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3698 display_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3699
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3700 if (lexer_debug_flag)
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3701 {
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3702 std::cerr << "R: ";
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3703 display_token (tok);
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3704 std::cerr << std::endl;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3705 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3706
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3707 return tok;
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	3708 }

Mercurial > hg > octave-nkf

annotate libinterp/parse-tree/lex.ll @ 16254:b8a2df776118 classdef