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

annotate libinterp/parse-tree/lex.ll @ 16106:031117f4db7c

use enum for values returned by eat_continuation and eat_whitespace * lex.ll, lex.h (lexical_feedback::whitespace_type): New enum. (yum_yum): Delete typedef. (ATE_NOTHING, ATE_SPACE_OR_TAB, ATE_NEWLINE): Replace with NO_WHITESPACE, SPACE_OR_TAB, NEWLINE values from lexical_feedback::whitespace_type enum. When result of eat_continuation is used as a logical test for whitespace or no whitespace, compare to lexical_feedback::NO_WHITESPACE to produce bool value.

author	John W. Eaton <jwe@octave.org>
date	Mon, 25 Feb 2013 23:48:32 -0500
parents	b7de58feb2d3
children	7302f8a4df83

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
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	23 %option prefix = "octave_"
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	24
10019 7ad32bf759c3 lex.cc: Use %top block to include config.h John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	25 %top {
7ad32bf759c3 lex.cc: Use %top block to include config.h John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	26 #ifdef HAVE_CONFIG_H
7ad32bf759c3 lex.cc: Use %top block to include config.h John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	27 #include <config.h>
7ad32bf759c3 lex.cc: Use %top block to include config.h John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	28 #endif
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	29
10019 7ad32bf759c3 lex.cc: Use %top block to include config.h John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	30 }
7ad32bf759c3 lex.cc: Use %top block to include config.h John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	31
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	32 %s COMMAND_START
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	33 %s MATRIX_START
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	34
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	35 %x SCRIPT_FILE_BEGIN
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	36 %x FUNCTION_FILE_BEGIN
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	37
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	38 %{
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 216 diff changeset	39
1341 e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	40 #include <cctype>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	41 #include <cstring>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	42
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	43 #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	44 #include <set>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5615 diff changeset	45 #include <sstream>
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	46 #include <string>
4214 b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe] jwe parents: 4208 diff changeset	47 #include <stack>
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	48
4093 5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4064 diff changeset	49 #include <sys/types.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4064 diff changeset	50 #include <unistd.h>
5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4064 diff changeset	51
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2900 diff changeset	52 #include "cmd-edit.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4131 diff changeset	53 #include "quit.h"
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	54 #include "lo-mappers.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2900 diff changeset	55
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	56 // These would be alphabetical, but y.tab.h must be included before
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	57 // oct-gperf.h and y.tab.h must be included after token.h and the tree
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	58 // class declarations. We can't include y.tab.h in oct-gperf.h
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	59 // 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	60 // times.
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	61
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	62 #include "Cell.h"
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	63 #include "comment-list.h"
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2167 diff changeset	64 #include "defun.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	65 #include "error.h"
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	66 #include "gripes.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1341 diff changeset	67 #include "input.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	68 #include "lex.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	69 #include "ov.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	70 #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	71 #include "parse-private.h"
2987 ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe] jwe parents: 2982 diff changeset	72 #include "pt-all.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	73 #include "symtab.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	74 #include "token.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	75 #include "toplev.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	76 #include "utils.h"
94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	77 #include "variables.h"
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9476 diff changeset	78 #include <oct-parse.h>
2492 06595bc7f2d0 [project @ 1996-11-09 00:13:50 by jwe] jwe parents: 2375 diff changeset	79 #include <oct-gperf.h>
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	80
10426 4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	81 #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	82 // 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	83 // 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	84 // 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	85 #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	86 #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	87 #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	88 #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	89 #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	90 #endif
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	91
2716 2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	92 #if ! (defined (FLEX_SCANNER) \
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	93 && 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	94 && 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	95 #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	96 #endif
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	97
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	98 #define yylval octave_lval
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	99
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	100 // Arrange to get input via readline.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	101
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	102 #ifdef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	103 #undef YY_INPUT
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	104 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	105 #define YY_INPUT(buf, result, max_size) \
16098 24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	106 result = octave_read (buf, max_size)
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	107
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	108 // 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	109 // The call to yy_fatal_error should never happen, but it avoids a
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	110 // 'static function defined but not used' warning from gcc.
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	111
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	112 #ifdef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	113 #undef YY_FATAL_ERROR
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	114 #endif
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	115 #define YY_FATAL_ERROR(msg) \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	116 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	117 { \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	118 error (msg); \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	119 OCTAVE_QUIT; \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	120 yy_fatal_error (msg); \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	121 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	122 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	123
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	124 #define DISPLAY_TOK_AND_RETURN(tok) \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	125 do \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	126 { \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	127 int tok_val = tok; \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	128 if (Vdisplay_tokens) \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	129 display_token (tok_val); \
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	130 if (lexer_debug_flag) \
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	131 { \
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	132 std::cerr << "R: "; \
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	133 display_token (tok_val); \
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	134 std::cerr << std::endl; \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	135 } \
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	136 return tok_val; \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	137 } \
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	138 while (0)
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	139
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	140 #define COUNT_TOK_AND_RETURN(tok) \
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	141 do \
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	142 { \
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	143 Vtoken_count++; \
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	144 DISPLAY_TOK_AND_RETURN (tok); \
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	145 } \
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	146 while (0)
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	147
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	148 #define TOK_RETURN(tok) \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	149 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	150 { \
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	151 lexer_flags.current_input_column += yyleng; \
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	152 lexer_flags.quote_is_transpose = false; \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	153 lexer_flags.convert_spaces_to_comma = true; \
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	154 COUNT_TOK_AND_RETURN (tok); \
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	155 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	156 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	157
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	158 #define TOK_PUSH_AND_RETURN(name, tok) \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	159 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	160 { \
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	161 yylval.tok_val = new token (name, lexer_flags.input_line_number, \
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	162 lexer_flags.current_input_column); \
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	163 token_stack.push (yylval.tok_val); \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	164 TOK_RETURN (tok); \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	165 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	166 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	167
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	168 #define BIN_OP_RETURN_INTERNAL(tok, convert, bos, qit) \
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	169 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	170 { \
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	171 yylval.tok_val = new token (lexer_flags.input_line_number, \
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	172 lexer_flags.current_input_column); \
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	173 token_stack.push (yylval.tok_val); \
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	174 lexer_flags.current_input_column += yyleng; \
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	175 lexer_flags.quote_is_transpose = qit; \
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	176 lexer_flags.convert_spaces_to_comma = convert; \
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	177 lexer_flags.looking_for_object_index = false; \
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	178 lexer_flags.at_beginning_of_statement = bos; \
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	179 COUNT_TOK_AND_RETURN (tok); \
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	180 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	181 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	182
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	183 #define XBIN_OP_RETURN_INTERNAL(tok, convert, bos, qit) \
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	184 do \
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	185 { \
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	186 gripe_matlab_incompatible_operator (yytext); \
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	187 BIN_OP_RETURN_INTERNAL (tok, convert, bos, qit); \
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	188 } \
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	189 while (0)
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	190
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	191 #define BIN_OP_RETURN(tok, convert, bos) \
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	192 do \
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	193 { \
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	194 BIN_OP_RETURN_INTERNAL (tok, convert, bos, false); \
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	195 } \
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	196 while (0)
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	197
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	198 #define XBIN_OP_RETURN(tok, convert, bos) \
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	199 do \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	200 { \
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	201 gripe_matlab_incompatible_operator (yytext); \
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	202 BIN_OP_RETURN (tok, convert, bos); \
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	203 } \
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	204 while (0)
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	205
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	206 #define LEXER_DEBUG(pattern) \
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	207 do \
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	208 { \
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	209 if (lexer_debug_flag) \
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	210 lexer_debug (pattern, yytext); \
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	211 } \
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	212 while (0)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	213
16100 6b26e18d1dcb reorder data members in lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16098 diff changeset	214 // The state of the lexer.
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	215 lexical_feedback lexer_flags;
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	216
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1341 diff changeset	217 // Stack to hold tokens so that we can delete them when the parser is
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1341 diff changeset	218 // reset and avoid growing forever just because we are stashing some
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1341 diff changeset	219 // information. This has to appear before lex.h is included, because
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1341 diff changeset	220 // one of the macros defined there uses token_stack.
2614 ae47b0911863 [project @ 1997-01-21 03:57:46 by jwe] jwe parents: 2542 diff changeset	221 //
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5765 diff changeset	222 // FIXME -- this should really be static, but that causes
2614 ae47b0911863 [project @ 1997-01-21 03:57:46 by jwe] jwe parents: 2542 diff changeset	223 // problems on some systems.
4214 b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe] jwe parents: 4208 diff changeset	224 std::stack <token*> token_stack;
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1341 diff changeset	225
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	226 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	227
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	228 static unsigned int Vtoken_count = 0;
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	229
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	230 // Internal variable for lexer debugging state.
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	231 static bool lexer_debug_flag = false;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	232
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	233 // Forward declarations for functions defined at the bottom of this
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	234 // file.
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	235
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	236 static int text_yyinput (void);
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	237 static void xunput (char c, char *buf);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	238 static void fixup_column_count (char *s);
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	239 static void do_comma_insert_check (void);
4867 c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe] jwe parents: 4765 diff changeset	240 static int is_keyword_token (const std::string& s);
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	241 static int process_comment (bool start_in_block, bool& eof);
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	242 static bool match_any (char c, const char *s);
3263 7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	243 static bool next_token_is_sep_op (void);
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	244 static bool next_token_is_bin_op (bool spc_prev);
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	245 static bool next_token_is_postfix_unary_op (bool spc_prev);
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	246 static std::string strip_trailing_whitespace (char *s);
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	247 static void handle_number (void);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	248 static int handle_string (char delim);
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4608 diff changeset	249 static int handle_close_bracket (bool spc_gobbled, int bracket_type);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	250 static int handle_superclass_identifier (void);
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	251 static int handle_meta_identifier (void);
3974 e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	252 static int handle_identifier (void);
3096 ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe] jwe parents: 3079 diff changeset	253 static bool have_continuation (bool trailing_comments_ok = true);
ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe] jwe parents: 3079 diff changeset	254 static bool have_ellipsis_continuation (bool trailing_comments_ok = true);
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	255 static void scan_for_comments (const char *);
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	256 static int eat_whitespace (void);
031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	257 static int eat_continuation (void);
16098 24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	258 static int octave_read (char *buf, unsigned int max_size);
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	259 static void maybe_warn_separator_insert (char sep);
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	260 static void gripe_single_quote_string (void);
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	261 static void gripe_matlab_incompatible (const std::string& msg);
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	262 static void maybe_gripe_matlab_incompatible_comment (char c);
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	263 static void gripe_matlab_incompatible_continuation (void);
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	264 static void gripe_matlab_incompatible_operator (const std::string& op);
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	265 static void display_token (int tok);
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	266 static void lexer_debug (const char pattern, const char text);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	267
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	268 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	269
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	270 D [0-9]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	271 S [ \t]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	272 NL ((\n)\|(\r)\|(\r\n))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	273 SNL ({S}\|{NL})
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	274 EL (\.\.\.)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	275 BS (\\)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	276 CONT ({EL}\|{BS})
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	277 Im [iIjJ]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	278 CCHAR [#%]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	279 COMMENT ({CCHAR}.*{NL})
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	280 SNLCMT ({SNL}\|{COMMENT})
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	281 NOT ((\~)\|(\!))
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	282 POW ((\\)\|(\^))
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	283 EPOW (\.{POW})
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	284 IDENT ([_$a-zA-Z][_$a-zA-Z0-9]*)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	285 EXPON ([DdEe][+-]?{D}+)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	286 NUMBER (({D}+\.?{D}*{EXPON}?)\|(\.{D}+{EXPON}?)\|(0[xX][0-9a-fA-F]+))
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	287 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	288
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	289 %{
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	290 // 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	291 // the parser go down a special path.
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	292 %}
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	293
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	294 <SCRIPT_FILE_BEGIN>. {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	295 LEXER_DEBUG ("<SCRIPT_FILE_BEGIN>.");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	296
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	297 BEGIN (INITIAL);
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	298 xunput (yytext[0], yytext);
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	299 COUNT_TOK_AND_RETURN (SCRIPT_FILE);
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	300 }
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	301
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	302 <FUNCTION_FILE_BEGIN>. {
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	303 LEXER_DEBUG ("<FUNCTION_FILE_BEGIN>.");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	304
4323 0990c9b77109 [project @ 2003-02-14 07:36:26 by jwe] jwe parents: 4318 diff changeset	305 BEGIN (INITIAL);
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	306 xunput (yytext[0], yytext);
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	307 COUNT_TOK_AND_RETURN (FUNCTION_FILE);
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	308 }
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	309
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	310 %{
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	311 // Help and other command-style functions.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	312 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	313
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	314 <COMMAND_START>{NL} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	315 LEXER_DEBUG ("<COMMAND_START>{NL}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	316
4323 0990c9b77109 [project @ 2003-02-14 07:36:26 by jwe] jwe parents: 4318 diff changeset	317 BEGIN (INITIAL);
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	318 lexer_flags.input_line_number++;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	319 lexer_flags.current_input_column = 1;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	320
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	321 lexer_flags.quote_is_transpose = false;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	322 lexer_flags.convert_spaces_to_comma = true;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	323 lexer_flags.looking_for_object_index = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	324 lexer_flags.at_beginning_of_statement = true;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	325
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	326 COUNT_TOK_AND_RETURN ('\n');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	327 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	328
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	329 <COMMAND_START>[\;\,] {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	330 LEXER_DEBUG ("<COMMAND_START>[\\;\\,]");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	331
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	332 lexer_flags.looking_for_object_index = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	333 lexer_flags.at_beginning_of_statement = true;
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	334
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	335 BEGIN (INITIAL);
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	336
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	337 if (strcmp (yytext, ",") == 0)
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	338 TOK_RETURN (',');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	339 else
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	340 TOK_RETURN (';');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	341 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	342
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	343 <COMMAND_START>[\"\'] {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	344 LEXER_DEBUG ("<COMMAND_START>[\\\"\\']");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	345
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	346 lexer_flags.at_beginning_of_statement = false;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	347
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	348 lexer_flags.current_input_column++;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	349 int tok = handle_string (yytext[0]);
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	350
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	351 COUNT_TOK_AND_RETURN (tok);
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	352 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	353
4923 b11223097ad4 [project @ 2004-08-02 16:33:11 by jwe] jwe parents: 4910 diff changeset	354 <COMMAND_START>[^#% \t\r\n\;\,\"\'][^ \t\r\n\;\,]{S} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	355 LEXER_DEBUG ("<COMMAND_START>[^#% \\t\\r\\n\\;\\,\\\"\\'][^ \\t\\r\\n\\;\\,]{S}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	356
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	357 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	358
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	359 lexer_flags.looking_for_object_index = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	360 lexer_flags.at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	361
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5225 diff changeset	362 TOK_PUSH_AND_RETURN (tok, SQ_STRING);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	363 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	364
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	365 %{
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	366 // 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	367 // need to know if the next token is '=' or '=='.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	368 //
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	369 // 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	370 // 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	371 // operator.
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	372 //
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	373 // 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	374 // after seeing a ']' character...
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	375
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	376 // FIXME -- we need to handle block comments here.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	377 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	378
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	379 <MATRIX_START>{SNLCMT}\]{S} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	380 LEXER_DEBUG ("<MATRIX_START>{SNLCMT}\\]{S}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	381
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	382 scan_for_comments (yytext);
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	383 fixup_column_count (yytext);
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	384
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	385 lexer_flags.looking_at_object_index.pop_front ();
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	386
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	387 lexer_flags.looking_for_object_index = true;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	388 lexer_flags.at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	389
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	390 int c = yytext[yyleng-1];
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	391 bool cont_is_spc = (eat_continuation () != lexical_feedback::NO_WHITESPACE);
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	392 bool spc_gobbled = (cont_is_spc \|\| c == ' ' \|\| c == '\t');
5345 2781568bf951 [project @ 2005-05-10 05:31:12 by jwe] jwe parents: 5307 diff changeset	393 int tok_to_return = handle_close_bracket (spc_gobbled, ']');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	394
5345 2781568bf951 [project @ 2005-05-10 05:31:12 by jwe] jwe parents: 5307 diff changeset	395 if (spc_gobbled)
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	396 xunput (' ', yytext);
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	397
5345 2781568bf951 [project @ 2005-05-10 05:31:12 by jwe] jwe parents: 5307 diff changeset	398 COUNT_TOK_AND_RETURN (tok_to_return);
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	399 }
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	400
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	401 %{
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	402 // 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	403 %}
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	404
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	405 <MATRIX_START>{SNLCMT}\}{S} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	406 LEXER_DEBUG ("<MATRIX_START>{SNLCMT}\\}{S}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	407
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	408 scan_for_comments (yytext);
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	409 fixup_column_count (yytext);
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	410
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	411 lexer_flags.looking_at_object_index.pop_front ();
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	412
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	413 lexer_flags.looking_for_object_index = true;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	414 lexer_flags.at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	415
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	416 int c = yytext[yyleng-1];
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	417 bool cont_is_spc = (eat_continuation () != lexical_feedback::NO_WHITESPACE);
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	418 bool spc_gobbled = (cont_is_spc \|\| c == ' ' \|\| c == '\t');
5345 2781568bf951 [project @ 2005-05-10 05:31:12 by jwe] jwe parents: 5307 diff changeset	419 int tok_to_return = handle_close_bracket (spc_gobbled, '}');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	420
5345 2781568bf951 [project @ 2005-05-10 05:31:12 by jwe] jwe parents: 5307 diff changeset	421 if (spc_gobbled)
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	422 xunput (' ', yytext);
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	423
5345 2781568bf951 [project @ 2005-05-10 05:31:12 by jwe] jwe parents: 5307 diff changeset	424 COUNT_TOK_AND_RETURN (tok_to_return);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	425 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	426
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	427 %{
1088 0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	428 // 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	429 // 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	430 // commas.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	431 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	432
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	433 <MATRIX_START>{S}\,{S} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	434 LEXER_DEBUG ("<MATRIX_START>{S}\\,{S}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	435
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	436 lexer_flags.current_input_column += yyleng;
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	437
1088 0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	438 int tmp = eat_continuation ();
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	439
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	440 lexer_flags.quote_is_transpose = false;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	441 lexer_flags.convert_spaces_to_comma = true;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	442 lexer_flags.looking_for_object_index = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	443 lexer_flags.at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	444
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	445 if (! lexer_flags.looking_at_object_index.front ())
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	446 {
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	447 if ((tmp & lexical_feedback::NEWLINE) == lexical_feedback::NEWLINE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	448 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	449 maybe_warn_separator_insert (';');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	450
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	451 xunput (';', yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	452 }
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	453 }
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	454
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	455 COUNT_TOK_AND_RETURN (',');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	456 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	457
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	458 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	459 // 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	460 // 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	461 // 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	462 // 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	463 %}
430 8464d5778a09 [project @ 1994-05-25 08:33:54 by jwe] jwe parents: 428 diff changeset	464
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	465 <MATRIX_START>{S}+ {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	466 LEXER_DEBUG ("<MATRIX_START>{S}+");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	467
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	468 lexer_flags.current_input_column += yyleng;
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	469
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	470 lexer_flags.at_beginning_of_statement = false;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	471
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	472 int tmp = eat_continuation ();
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	473
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	474 if (! lexer_flags.looking_at_object_index.front ())
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	475 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	476 bool bin_op = next_token_is_bin_op (true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	477 bool postfix_un_op = next_token_is_postfix_unary_op (true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	478 bool sep_op = next_token_is_sep_op ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	479
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	480 if (! (postfix_un_op \|\| bin_op \|\| sep_op)
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	481 && lexer_flags.nesting_level.is_bracket_or_brace ()
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	482 && lexer_flags.convert_spaces_to_comma)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	483 {
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	484 if ((tmp & lexical_feedback::NEWLINE) == lexical_feedback::NEWLINE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	485 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	486 maybe_warn_separator_insert (';');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	487
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	488 xunput (';', yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	489 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	490
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	491 lexer_flags.quote_is_transpose = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	492 lexer_flags.convert_spaces_to_comma = true;
13260 28e3e9158d70 fix bug with parsing cell array lists John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	493 lexer_flags.looking_for_object_index = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	494
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	495 maybe_warn_separator_insert (',');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	496
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	497 COUNT_TOK_AND_RETURN (',');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	498 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	499 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	500 }
430 8464d5778a09 [project @ 1994-05-25 08:33:54 by jwe] jwe parents: 428 diff changeset	501
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	502 %{
1088 0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	503 // 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	504 // 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	505 // semicolons.
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	506
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	507 // FIXME -- we need to handle block comments here.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	508 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	509
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	510 <MATRIX_START>{SNLCMT};{SNLCMT} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	511 LEXER_DEBUG ("<MATRIX_START>{SNLCMT};{SNLCMT}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	512
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	513 scan_for_comments (yytext);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	514 fixup_column_count (yytext);
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	515 eat_whitespace ();
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	516
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	517 lexer_flags.quote_is_transpose = false;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	518 lexer_flags.convert_spaces_to_comma = true;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	519 lexer_flags.looking_for_object_index = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	520 lexer_flags.at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	521
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	522 COUNT_TOK_AND_RETURN (';');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	523 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	524
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	525 %{
1088 0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	526 // 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	527 // 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	528 // semicolons.
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	529
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	530 // FIXME -- we need to handle block comments here.
985 4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	531 %}
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	532
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	533 <MATRIX_START>{S}{COMMENT}{SNLCMT} \|
e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	534 <MATRIX_START>{S}{NL}{SNLCMT} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	535 LEXER_DEBUG ("<MATRIX_START>{S}{COMMENT}{SNLCMT}\|<MATRIX_START>{S}{NL}{SNLCMT}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	536
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	537 scan_for_comments (yytext);
1082 d1a1608f1028 [project @ 1995-01-27 22:26:33 by jwe] jwe parents: 1072 diff changeset	538 fixup_column_count (yytext);
1088 0491f3433f66 [project @ 1995-02-01 21:43:25 by jwe] jwe parents: 1082 diff changeset	539 eat_whitespace ();
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	540
4476 b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	541 lexer_flags.quote_is_transpose = false;
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	542 lexer_flags.convert_spaces_to_comma = true;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	543 lexer_flags.at_beginning_of_statement = false;
4476 b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	544
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	545 if (lexer_flags.nesting_level.none ())
4476 b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	546 return LEXICAL_ERROR;
985 4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	547
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	548 if (! lexer_flags.looking_at_object_index.front ()
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	549 && lexer_flags.nesting_level.is_bracket_or_brace ())
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	550 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	551 maybe_warn_separator_insert (';');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	552
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	553 COUNT_TOK_AND_RETURN (';');
985 4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	554 }
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	555 }
4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	556
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	557 \[{S}* {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	558 LEXER_DEBUG ("\\[{S}*");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	559
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	560 lexer_flags.nesting_level.bracket ();
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	561
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	562 lexer_flags.looking_at_object_index.push_front (false);
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	563
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	564 lexer_flags.current_input_column += yyleng;
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	565 lexer_flags.quote_is_transpose = false;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	566 lexer_flags.convert_spaces_to_comma = true;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	567 lexer_flags.looking_for_object_index = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	568 lexer_flags.at_beginning_of_statement = false;
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	569
11464 21b5284fa78d avoid error when parsing nested functions John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	570 if (lexer_flags.defining_func
21b5284fa78d avoid error when parsing nested functions John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	571 && ! lexer_flags.parsed_function_name.top ())
5615 d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe] jwe parents: 5570 diff changeset	572 lexer_flags.looking_at_return_list = true;
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe] jwe parents: 5570 diff changeset	573 else
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe] jwe parents: 5570 diff changeset	574 lexer_flags.looking_at_matrix_or_assign_lhs = true;
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe] jwe parents: 5570 diff changeset	575
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	576 promptflag--;
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	577 eat_whitespace ();
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	578
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	579 lexer_flags.bracketflag++;
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	580 BEGIN (MATRIX_START);
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	581 COUNT_TOK_AND_RETURN ('[');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	582 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	583
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	584 \] {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	585 LEXER_DEBUG ("\\]");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	586
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	587 lexer_flags.nesting_level.remove ();
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	588
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	589 lexer_flags.looking_at_object_index.pop_front ();
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	590
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	591 lexer_flags.looking_for_object_index = true;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	592 lexer_flags.at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	593
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	594 TOK_RETURN (']');
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	595 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	596
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	597 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	598 // Imaginary numbers.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	599 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	600
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	601 {NUMBER}{Im} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	602 LEXER_DEBUG ("{NUMBER}{Im}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	603
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	604 handle_number ();
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	605 COUNT_TOK_AND_RETURN (IMAG_NUM);
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	606 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	607
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	608 %{
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	609 // 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	610 // the constant.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	611 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	612
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	613 {D}+/\.[\*/\\^\'] \|
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	614 {NUMBER} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	615 LEXER_DEBUG ("{D}+/\\.[\\*/\\^\\']\|{NUMBER}");
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	616 handle_number ();
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	617 COUNT_TOK_AND_RETURN (NUM);
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	618 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	619
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	620 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	621 // 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	622 // the <MATRIX_START> start state code above.
968 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
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	625 {S}* {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	626 lexer_flags.current_input_column += yyleng;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	627 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	628
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	629 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	630 // Continuation lines. Allow comments after continuations.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	631 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	632
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	633 {CONT}{S}*{NL} \|
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	634 {CONT}{S}*{COMMENT} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	635 LEXER_DEBUG ("{CONT}{S}{NL}\|{CONT}{S}{COMMENT}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	636
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	637 if (yytext[0] == '\\')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	638 gripe_matlab_incompatible_continuation ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	639 scan_for_comments (yytext);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	640 promptflag--;
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	641 lexer_flags.input_line_number++;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	642 lexer_flags.current_input_column = 1;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	643 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	644
968 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 // End of file.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	647 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	648
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	649 <<EOF>> {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	650 LEXER_DEBUG ("<<EOF>>");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	651
16105 b7de58feb2d3 move block_comment_nesting_level to lexical_feedback_class John W. Eaton <jwe@octave.org> parents: 16104 diff changeset	652 if (lexer_flags.block_comment_nesting_level != 0)
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	653 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	654 warning ("block comment open at end of input");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	655
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	656 if ((reading_fcn_file \|\| reading_script_file \|\| reading_classdef_file)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	657 && ! curr_fcn_file_name.empty ())
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	658 warning ("near line %d of file '%s.m'",
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	659 lexer_flags.input_line_number, curr_fcn_file_name.c_str ());
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	660 }
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	661
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	662 TOK_RETURN (END_OF_INPUT);
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 %{
970 9382316a8a01 [project @ 1994-12-12 06:03:34 by jwe] jwe parents: 969 diff changeset	666 // 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	667 // don't write directly on yytext.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	668 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	669
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	670 {IDENT}{S}* {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	671 LEXER_DEBUG ("{IDENT}{S}*");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	672
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	673 int id_tok = handle_identifier ();
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	674
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	675 if (id_tok >= 0)
9324 29563379fa9b don't look for object index after keyword John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	676 COUNT_TOK_AND_RETURN (id_tok);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	677 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	678
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	679 %{
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	680 // Superclass method identifiers.
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	681 %}
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	682
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	683 {IDENT}@{IDENT}{S}* \|
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	684 {IDENT}@{IDENT}.{IDENT}{S}* {
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	685 LEXER_DEBUG ("{IDENT}@{IDENT}{S}\|{IDENT}@{IDENT}.{IDENT}{S}");
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	686
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	687 int id_tok = handle_superclass_identifier ();
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	688
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	689 if (id_tok >= 0)
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	690 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	691 lexer_flags.looking_for_object_index = true;
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 COUNT_TOK_AND_RETURN (SUPERCLASSREF);
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	694 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	695 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	696
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	697 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	698 // Metaclass query
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	699 %}
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	700
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	701 \?{IDENT}{S}* \|
14638 5b0872b5b234 fix missing backslash quoting in lexer rules John W. Eaton <jwe@octave.org> parents: 14510 diff changeset	702 \?{IDENT}\.{IDENT}{S}* {
5b0872b5b234 fix missing backslash quoting in lexer rules John W. Eaton <jwe@octave.org> parents: 14510 diff changeset	703 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	704
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	705 int id_tok = handle_meta_identifier ();
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	706
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	707 if (id_tok >= 0)
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	708 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	709 lexer_flags.looking_for_object_index = true;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	710
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	711 COUNT_TOK_AND_RETURN (METAQUERY);
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	712 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	713 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	714
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	715 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	716 // Function handles and superclass references
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	717 %}
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	718
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	719 "@" {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	720 LEXER_DEBUG ("@");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	721
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	722 lexer_flags.current_input_column++;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	723
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	724 lexer_flags.quote_is_transpose = false;
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	725 lexer_flags.convert_spaces_to_comma = false;
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	726 lexer_flags.looking_at_function_handle++;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	727 lexer_flags.looking_for_object_index = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	728 lexer_flags.at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	729
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	730 COUNT_TOK_AND_RETURN ('@');
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	731
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	732 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	733
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	734 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	735 // 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	736 // 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	737 // 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	738 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	739
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	740 {NL} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	741 LEXER_DEBUG ("{NL}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	742
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	743 lexer_flags.input_line_number++;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	744 lexer_flags.current_input_column = 1;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	745
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	746 lexer_flags.quote_is_transpose = false;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	747 lexer_flags.convert_spaces_to_comma = true;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	748
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	749 if (lexer_flags.nesting_level.none ())
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	750 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	751 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	752 COUNT_TOK_AND_RETURN ('\n');
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	753 }
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	754 else if (lexer_flags.nesting_level.is_paren ())
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	755 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	756 lexer_flags.at_beginning_of_statement = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	757 gripe_matlab_incompatible ("bare newline inside parentheses");
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	758 }
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	759 else if (lexer_flags.nesting_level.is_bracket_or_brace ())
985 4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	760 return LEXICAL_ERROR;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	761 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	762
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	763 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	764 // 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	765 // operator.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	766 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	767
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	768 "'" {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	769 LEXER_DEBUG ("'");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	770
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	771 lexer_flags.current_input_column++;
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	772 lexer_flags.convert_spaces_to_comma = true;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	773
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	774 if (lexer_flags.quote_is_transpose)
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	775 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	776 do_comma_insert_check ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	777 COUNT_TOK_AND_RETURN (QUOTE);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	778 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	779 else
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	780 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	781 int tok = handle_string ('\'');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	782 COUNT_TOK_AND_RETURN (tok);
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	783 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	784 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	785
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	786 %{
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	787 // Double quotes always begin strings.
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	788 %}
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	789
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	790 \" {
14642 6edd02858516 lex.ll: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 14638 diff changeset	791 LEXER_DEBUG ("\"");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	792
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	793 lexer_flags.current_input_column++;
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	794 int tok = handle_string ('"');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	795
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	796 COUNT_TOK_AND_RETURN (tok);
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	797 }
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	798
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	799 %{
8536 de1b944d5306 lex.l: finish previous change John W. Eaton <jwe@octave.org> parents: 8535 diff changeset	800 // Gobble comments.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	801 %}
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	802
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	803 {CCHAR} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	804 LEXER_DEBUG ("{CCHAR}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	805
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	806 lexer_flags.looking_for_object_index = false;
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	807
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	808 xunput (yytext[0], yytext);
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	809
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	810 bool eof = false;
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	811 int tok = process_comment (false, eof);
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	812
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	813 if (eof)
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	814 TOK_RETURN (END_OF_INPUT);
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	815 else if (tok > 0)
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	816 COUNT_TOK_AND_RETURN (tok);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	817 }
440 e27d10f2e573 [project @ 1994-05-30 03:33:37 by jwe] jwe parents: 430 diff changeset	818
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	819 %{
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	820 // Block comments.
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	821 %}
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	822
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	823 ^{S}{CCHAR}\{{S}{NL} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	824 LEXER_DEBUG ("^{S}{CCHAR}\\{{S}{NL}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	825
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	826 lexer_flags.looking_for_object_index = false;
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	827
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	828 lexer_flags.input_line_number++;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	829 lexer_flags.current_input_column = 1;
16105 b7de58feb2d3 move block_comment_nesting_level to lexical_feedback_class John W. Eaton <jwe@octave.org> parents: 16104 diff changeset	830 lexer_flags.block_comment_nesting_level++;
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	831 promptflag--;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	832
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	833 bool eof = false;
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	834 process_comment (true, eof);
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	835 }
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	836
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	837 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	838 // Other operators.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	839 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	840
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	841 ":" { LEXER_DEBUG (":"); BIN_OP_RETURN (':', false, false); }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	842
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	843 ".+" { LEXER_DEBUG (".+"); XBIN_OP_RETURN (EPLUS, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	844 ".-" { LEXER_DEBUG (".-"); XBIN_OP_RETURN (EMINUS, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	845 "." { LEXER_DEBUG ("."); BIN_OP_RETURN (EMUL, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	846 "./" { LEXER_DEBUG ("./"); BIN_OP_RETURN (EDIV, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	847 ".\\" { LEXER_DEBUG (".\\"); BIN_OP_RETURN (ELEFTDIV, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	848 ".^" { LEXER_DEBUG (".^"); BIN_OP_RETURN (EPOW, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	849 "." { LEXER_DEBUG ("."); XBIN_OP_RETURN (EPOW, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	850 ".'" { LEXER_DEBUG (".'"); do_comma_insert_check (); BIN_OP_RETURN (TRANSPOSE, true, false); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	851 "++" { LEXER_DEBUG ("++"); do_comma_insert_check (); XBIN_OP_RETURN_INTERNAL (PLUS_PLUS, true, false, true); }
002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	852 "--" { LEXER_DEBUG ("--"); do_comma_insert_check (); XBIN_OP_RETURN_INTERNAL (MINUS_MINUS, true, false, true); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	853 "<=" { LEXER_DEBUG ("<="); BIN_OP_RETURN (EXPR_LE, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	854 "==" { LEXER_DEBUG ("=="); BIN_OP_RETURN (EXPR_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	855 "~=" { LEXER_DEBUG ("~="); BIN_OP_RETURN (EXPR_NE, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	856 "!=" { LEXER_DEBUG ("!="); XBIN_OP_RETURN (EXPR_NE, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	857 ">=" { LEXER_DEBUG (">="); BIN_OP_RETURN (EXPR_GE, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	858 "&" { LEXER_DEBUG ("&"); BIN_OP_RETURN (EXPR_AND, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	859 "\|" { LEXER_DEBUG ("\|"); BIN_OP_RETURN (EXPR_OR, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	860 "<" { LEXER_DEBUG ("<"); BIN_OP_RETURN (EXPR_LT, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	861 ">" { LEXER_DEBUG (">"); BIN_OP_RETURN (EXPR_GT, false, false); }
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	862 "+" { LEXER_DEBUG ("+"); BIN_OP_RETURN ('+', false, false); }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	863 "-" { LEXER_DEBUG ("-"); BIN_OP_RETURN ('-', false, false); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	864 "" { LEXER_DEBUG (""); BIN_OP_RETURN ('*', false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	865 "/" { LEXER_DEBUG ("/"); BIN_OP_RETURN ('/', false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	866 "\\" { LEXER_DEBUG ("\\"); BIN_OP_RETURN (LEFTDIV, false, false); }
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	867 ";" { LEXER_DEBUG (";"); BIN_OP_RETURN (';', true, true); }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	868 "," { LEXER_DEBUG (","); BIN_OP_RETURN (',', true, ! lexer_flags.looking_at_object_index.front ()); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	869 "^" { LEXER_DEBUG ("^"); BIN_OP_RETURN (POW, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	870 "" { LEXER_DEBUG (""); XBIN_OP_RETURN (POW, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	871 "=" { LEXER_DEBUG ("="); BIN_OP_RETURN ('=', true, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	872 "&&" { LEXER_DEBUG ("&&"); BIN_OP_RETURN (EXPR_AND_AND, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	873 "\|\|" { LEXER_DEBUG ("\|\|"); BIN_OP_RETURN (EXPR_OR_OR, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	874 "<<" { LEXER_DEBUG ("<<"); XBIN_OP_RETURN (LSHIFT, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	875 ">>" { LEXER_DEBUG (">>"); XBIN_OP_RETURN (RSHIFT, false, false); }
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	876
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	877 {NOT} {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	878 LEXER_DEBUG ("{NOT}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	879
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	880 if (yytext[0] == '~')
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	881 BIN_OP_RETURN (EXPR_NOT, false, false);
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	882 else
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	883 XBIN_OP_RETURN (EXPR_NOT, false, false);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	884 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	885
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	886 "(" {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	887 LEXER_DEBUG ("(");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	888
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	889 // 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	890 // 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	891 // 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	892 // the matching close paren).
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	893
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	894 lexer_flags.looking_at_object_index.push_front
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	895 (lexer_flags.looking_for_object_index);
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	896
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4101 diff changeset	897 lexer_flags.looking_at_indirect_ref = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	898 lexer_flags.looking_for_object_index = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	899 lexer_flags.at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	900
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	901 lexer_flags.nesting_level.paren ();
985 4b483cf9f6b0 [project @ 1994-12-14 18:06:38 by jwe] jwe parents: 975 diff changeset	902 promptflag--;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	903
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	904 TOK_RETURN ('(');
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	905 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	906
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	907 ")" {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	908 LEXER_DEBUG (")");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	909
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	910 lexer_flags.nesting_level.remove ();
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	911 lexer_flags.current_input_column++;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	912
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	913 lexer_flags.looking_at_object_index.pop_front ();
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	914
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	915 lexer_flags.quote_is_transpose = true;
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 12801 diff changeset	916 lexer_flags.convert_spaces_to_comma
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	917 = (lexer_flags.nesting_level.is_bracket_or_brace ()
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 12801 diff changeset	918 && ! lexer_flags.looking_at_anon_fcn_args);
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	919 lexer_flags.looking_for_object_index = true;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	920 lexer_flags.at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	921
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 12801 diff changeset	922 if (lexer_flags.looking_at_anon_fcn_args)
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 12801 diff changeset	923 lexer_flags.looking_at_anon_fcn_args = false;
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 12801 diff changeset	924
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	925 do_comma_insert_check ();
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	926
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	927 COUNT_TOK_AND_RETURN (')');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	928 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	929
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	930 "." {
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	931 LEXER_DEBUG (".");
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	932
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	933 lexer_flags.looking_for_object_index = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	934 lexer_flags.at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	935
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	936 TOK_RETURN ('.');
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	937 }
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	938
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	939 "+=" { LEXER_DEBUG ("+="); XBIN_OP_RETURN (ADD_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	940 "-=" { LEXER_DEBUG ("-="); XBIN_OP_RETURN (SUB_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	941 "=" { LEXER_DEBUG ("="); XBIN_OP_RETURN (MUL_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	942 "/=" { LEXER_DEBUG ("/="); XBIN_OP_RETURN (DIV_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	943 "\\=" { LEXER_DEBUG ("\\="); XBIN_OP_RETURN (LEFTDIV_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	944 ".+=" { LEXER_DEBUG (".+="); XBIN_OP_RETURN (ADD_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	945 ".-=" { LEXER_DEBUG (".-="); XBIN_OP_RETURN (SUB_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	946 ".=" { LEXER_DEBUG (".="); XBIN_OP_RETURN (EMUL_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	947 "./=" { LEXER_DEBUG ("./="); XBIN_OP_RETURN (EDIV_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	948 ".\\=" { LEXER_DEBUG (".\\="); XBIN_OP_RETURN (ELEFTDIV_EQ, false, false); }
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	949 {POW}= { LEXER_DEBUG ("{POW}="); XBIN_OP_RETURN (POW_EQ, false, false); }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	950 {EPOW}= { LEXER_DEBUG ("{EPOW}="); XBIN_OP_RETURN (EPOW_EQ, false, false); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	951 "&=" { LEXER_DEBUG ("&="); XBIN_OP_RETURN (AND_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	952 "\|=" { LEXER_DEBUG ("\|="); XBIN_OP_RETURN (OR_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	953 "<<=" { LEXER_DEBUG ("<<="); XBIN_OP_RETURN (LSHIFT_EQ, false, false); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	954 ">>=" { LEXER_DEBUG (">>="); XBIN_OP_RETURN (RSHIFT_EQ, false, false); }
2877 5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe] jwe parents: 2861 diff changeset	955
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	956 \{{S}* {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	957 LEXER_DEBUG ("\\{{S}*");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	958
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	959 lexer_flags.nesting_level.brace ();
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	960
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	961 lexer_flags.looking_at_object_index.push_front
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	962 (lexer_flags.looking_for_object_index);
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	963
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	964 lexer_flags.current_input_column += yyleng;
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	965 lexer_flags.quote_is_transpose = false;
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	966 lexer_flags.convert_spaces_to_comma = true;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	967 lexer_flags.looking_for_object_index = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	968 lexer_flags.at_beginning_of_statement = false;
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	969
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	970 promptflag--;
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	971 eat_whitespace ();
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	972
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	973 lexer_flags.braceflag++;
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	974 BEGIN (MATRIX_START);
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	975 COUNT_TOK_AND_RETURN ('{');
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	976 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	977
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	978 "}" {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	979 LEXER_DEBUG ("}");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	980
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	981 lexer_flags.looking_at_object_index.pop_front ();
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	982
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	983 lexer_flags.looking_for_object_index = true;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	984 lexer_flags.at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	985
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	986 lexer_flags.nesting_level.remove ();
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	987
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	988 TOK_RETURN ('}');
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	989 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	990
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	991 %{
2066 a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe] jwe parents: 2042 diff changeset	992 // Unrecognized input is a lexical error.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	993 %}
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	994
2042 31f4f775b8c6 [project @ 1996-03-28 09:06:28 by jwe] jwe parents: 1994 diff changeset	995 . {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	996 LEXER_DEBUG (".");
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	997
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	998 xunput (yytext[0], yytext);
4248 eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe] jwe parents: 4241 diff changeset	999
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	1000 int c = text_yyinput ();
4248 eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe] jwe parents: 4241 diff changeset	1001
eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe] jwe parents: 4241 diff changeset	1002 if (c != EOF)
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	1003 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1004 lexer_flags.current_input_column++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1005
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	1006 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	1007 undo_string_escape (static_cast<char> (c)), c,
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1008 lexer_flags.input_line_number, lexer_flags.current_input_column);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1009
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1010 return LEXICAL_ERROR;
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	1011 }
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	1012 else
8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	1013 TOK_RETURN (END_OF_INPUT);
2066 a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe] jwe parents: 2042 diff changeset	1014 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1015
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1016 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1017
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1018 // GAG.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1019 //
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1020 // If we're reading a matrix and the next character is '[', make sure
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1021 // that we insert a comma ahead of it.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1022
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	1023 void
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1024 do_comma_insert_check (void)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1025 {
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	1026 bool spc_gobbled = (eat_continuation () != lexical_feedback::NO_WHITESPACE);
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	1027
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	1028 int c = text_yyinput ();
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	1029
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1030 xunput (c, yytext);
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	1031
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	1032 if (spc_gobbled)
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1033 xunput (' ', yytext);
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1034
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1035 lexer_flags.do_comma_insert = (! lexer_flags.looking_at_object_index.front ()
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1036 && lexer_flags.bracketflag && c == '[');
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1037 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1038
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1039 // Fix things up for errors or interrupts. The parser is never called
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1040 // recursively, so it is always safe to reinitialize its state before
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1041 // doing any parsing.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1042
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1043 void
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1044 reset_parser (void)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1045 {
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	1046 // Start off on the right foot.
4323 0990c9b77109 [project @ 2003-02-14 07:36:26 by jwe] jwe parents: 4318 diff changeset	1047 BEGIN (INITIAL);
4318 115bffcecfd3 [project @ 2003-02-13 05:52:16 by jwe] jwe parents: 4264 diff changeset	1048
14329 8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	1049 parser_symtab_context.clear ();
287 6027a905fc06 [project @ 1994-01-13 01:41:00 by jwe] jwe parents: 246 diff changeset	1050
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	1051 // We do want a prompt by default.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1052 promptflag = 1;
287 6027a905fc06 [project @ 1994-01-13 01:41:00 by jwe] jwe parents: 246 diff changeset	1053
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	1054 // Clear out the stack of token info used to track line and column
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	1055 // numbers.
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 120 diff changeset	1056 while (! token_stack.empty ())
4214 b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe] jwe parents: 4208 diff changeset	1057 {
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe] jwe parents: 4208 diff changeset	1058 delete token_stack.top ();
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe] jwe parents: 4208 diff changeset	1059 token_stack.pop ();
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe] jwe parents: 4208 diff changeset	1060 }
287 6027a905fc06 [project @ 1994-01-13 01:41:00 by jwe] jwe parents: 246 diff changeset	1061
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	1062 // Only ask for input from stdin if we are expecting interactive
b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	1063 // input.
14074 f90c3facfac3 don't reset parser when exiting (bug #35120) John W. Eaton <jwe@octave.org> parents: 13973 diff changeset	1064
f90c3facfac3 don't reset parser when exiting (bug #35120) John W. Eaton <jwe@octave.org> parents: 13973 diff changeset	1065 if (! quitting_gracefully
f90c3facfac3 don't reset parser when exiting (bug #35120) John W. Eaton <jwe@octave.org> parents: 13973 diff changeset	1066 && (interactive \|\| forced_interactive)
3880 c21ae2c5840f [project @ 2002-03-26 02:23:06 by jwe] jwe parents: 3867 diff changeset	1067 && ! (reading_fcn_file
14074 f90c3facfac3 don't reset parser when exiting (bug #35120) John W. Eaton <jwe@octave.org> parents: 13973 diff changeset	1068 \|\| reading_classdef_file
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1069 \|\| reading_script_file
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1070 \|\| get_input_from_eval_string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1071 \|\| input_from_startup_file))
287 6027a905fc06 [project @ 1994-01-13 01:41:00 by jwe] jwe parents: 246 diff changeset	1072 yyrestart (stdin);
991 18be848f10a9 [project @ 1994-12-15 06:06:46 by jwe] jwe parents: 985 diff changeset	1073
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	1074 // Clear the buffer for help text.
4426 51a0dcde8778 [project @ 2003-06-13 19:16:37 by jwe] jwe parents: 4410 diff changeset	1075 while (! help_buf.empty ())
51a0dcde8778 [project @ 2003-06-13 19:16:37 by jwe] jwe parents: 4410 diff changeset	1076 help_buf.pop ();
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1740 diff changeset	1077
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	1078 // Reset other flags.
16101 8d19626b38ae provide copy contructor and operator = for lexical_feedback class. John W. Eaton <jwe@octave.org> parents: 16100 diff changeset	1079 lexer_flags = lexical_feedback ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1080 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1081
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1082 static void
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1083 display_character (char c)
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 if (isgraph (c))
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1086 std::cerr << c;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1087 else
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1088 switch (c)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1089 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1090 case 0:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1091 std::cerr << "NUL";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1092 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1093
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1094 case 1:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1095 std::cerr << "SOH";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1096 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1097
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1098 case 2:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1099 std::cerr << "STX";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1100 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1101
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1102 case 3:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1103 std::cerr << "ETX";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1104 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1105
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1106 case 4:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1107 std::cerr << "EOT";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1108 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1109
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1110 case 5:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1111 std::cerr << "ENQ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1112 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1113
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1114 case 6:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1115 std::cerr << "ACK";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1116 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1117
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1118 case 7:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1119 std::cerr << "\\a";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1120 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1121
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1122 case 8:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1123 std::cerr << "\\b";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1124 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1125
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1126 case 9:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1127 std::cerr << "\\t";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1128 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1129
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1130 case 10:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1131 std::cerr << "\\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1132 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1133
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1134 case 11:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1135 std::cerr << "\\v";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1136 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1137
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1138 case 12:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1139 std::cerr << "\\f";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1140 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1141
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1142 case 13:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1143 std::cerr << "\\r";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1144 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1145
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1146 case 14:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1147 std::cerr << "SO";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1148 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1149
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1150 case 15:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1151 std::cerr << "SI";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1152 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1153
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1154 case 16:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1155 std::cerr << "DLE";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1156 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1157
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1158 case 17:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1159 std::cerr << "DC1";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1160 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1161
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1162 case 18:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1163 std::cerr << "DC2";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1164 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1165
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1166 case 19:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1167 std::cerr << "DC3";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1168 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1169
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1170 case 20:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1171 std::cerr << "DC4";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1172 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1173
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1174 case 21:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1175 std::cerr << "NAK";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1176 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1177
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1178 case 22:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1179 std::cerr << "SYN";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1180 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1181
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1182 case 23:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1183 std::cerr << "ETB";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1184 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1185
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1186 case 24:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1187 std::cerr << "CAN";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1188 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1189
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1190 case 25:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1191 std::cerr << "EM";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1192 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1193
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1194 case 26:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1195 std::cerr << "SUB";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1196 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1197
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1198 case 27:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1199 std::cerr << "ESC";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1200 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1201
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1202 case 28:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1203 std::cerr << "FS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1204 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1205
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1206 case 29:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1207 std::cerr << "GS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1208 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1209
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1210 case 30:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1211 std::cerr << "RS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1212 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1213
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1214 case 31:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1215 std::cerr << "US";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1216 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1217
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1218 case 32:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1219 std::cerr << "SPACE";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1220 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1221
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1222 case 127:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1223 std::cerr << "DEL";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1224 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1225 }
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1226 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1227
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1228 static int
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1229 text_yyinput (void)
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1230 {
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1231 int c = yyinput ();
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1232
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1233 if (lexer_debug_flag)
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1234 {
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1235 std::cerr << "I: ";
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1236 display_character (c);
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1237 std::cerr << std::endl;
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1238 }
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1239
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1240 // Convert CRLF into just LF and single CR into LF.
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1241
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1242 if (c == '\r')
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1243 {
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1244 c = yyinput ();
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1245
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1246 if (lexer_debug_flag)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1247 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1248 std::cerr << "I: ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1249 display_character (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1250 std::cerr << std::endl;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1251 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1252
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1253 if (c != '\n')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1254 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1255 xunput (c, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1256 c = '\n';
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1257 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1258 }
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1259
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1260 if (c == '\n')
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1261 lexer_flags.input_line_number++;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1262
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1263 return c;
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1264 }
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1265
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1266 static void
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1267 xunput (char c, char *buf)
adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1268 {
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1269 if (lexer_debug_flag)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1270 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1271 std::cerr << "U: ";
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1272 display_character (c);
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1273 std::cerr << std::endl;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1274 }
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1275
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1276 if (c == '\n')
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1277 lexer_flags.input_line_number--;
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1278
adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1279 yyunput (c, buf);
adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1280 }
adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1281
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1282 // If we read some newlines, we need figure out what column we're
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1283 // really looking at.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1284
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1285 static void
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1286 fixup_column_count (char *s)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1287 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1288 char c;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1289 while ((c = *s++) != '\0')
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1290 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1291 if (c == '\n')
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1292 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1293 lexer_flags.input_line_number++;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1294 lexer_flags.current_input_column = 1;
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1295 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1296 else
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1297 lexer_flags.current_input_column++;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1298 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1299 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1300
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1301 // Include these so that we don't have to link to libfl.a.
246 e4d5f689f06d [project @ 1993-12-04 20:01:37 by jwe] jwe parents: 240 diff changeset	1302
3332 7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe] jwe parents: 3263 diff changeset	1303 int
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1304 yywrap (void)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1305 {
287 6027a905fc06 [project @ 1994-01-13 01:41:00 by jwe] jwe parents: 246 diff changeset	1306 return 1;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1307 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1308
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1309 // Tell us all what the current buffer is.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1310
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1311 YY_BUFFER_STATE
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1312 current_buffer (void)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1313 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1314 return YY_CURRENT_BUFFER;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1315 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1316
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1317 // Create a new buffer.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1318
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1319 YY_BUFFER_STATE
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1320 create_buffer (FILE *f)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1321 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1322 return yy_create_buffer (f, YY_BUF_SIZE);
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1323 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1324
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1325 // Start reading a new buffer.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1326
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1327 void
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1328 switch_to_buffer (YY_BUFFER_STATE buf)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1329 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1330 yy_switch_to_buffer (buf);
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1331 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1332
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1333 // Delete a buffer.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1334
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1335 void
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1336 delete_buffer (YY_BUFFER_STATE buf)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1337 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1338 yy_delete_buffer (buf);
14510 c20de00a66a9 avoid memory error in 'octave --eval 0' (bug #36038) Max Brister <max@2bass.com> parents: 14329 diff changeset	1339
c20de00a66a9 avoid memory error in 'octave --eval 0' (bug #36038) Max Brister <max@2bass.com> parents: 14329 diff changeset	1340 // Prevent invalid yyin from being used by yyrestart.
c20de00a66a9 avoid memory error in 'octave --eval 0' (bug #36038) Max Brister <max@2bass.com> parents: 14329 diff changeset	1341 if (! current_buffer ())
c20de00a66a9 avoid memory error in 'octave --eval 0' (bug #36038) Max Brister <max@2bass.com> parents: 14329 diff changeset	1342 yyin = 0;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1343 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1344
13973 2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1345 // Delete all buffers from the stack.
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1346 void
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1347 clear_all_buffers (void)
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1348 {
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1349 while (current_buffer ())
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1350 octave_pop_buffer_state ();
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1351 }
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1352
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1353 void
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1354 cleanup_parser (void)
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1355 {
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1356 reset_parser ();
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1357
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1358 clear_all_buffers ();
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1359 }
2c664266e9d0 clean up parser memory on exit John W. Eaton <jwe@octave.org> parents: 13260 diff changeset	1360
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1361 // Restore a buffer (for unwind-prot).
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1362
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1363 void
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1364 restore_input_buffer (void *buf)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1365 {
2861 6dcb8e1c9bb2 [project @ 1997-04-13 23:21:38 by jwe] jwe parents: 2857 diff changeset	1366 switch_to_buffer (static_cast<YY_BUFFER_STATE> (buf));
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1367 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1368
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1369 // Delete a buffer (for unwind-prot).
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1370
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1371 void
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1372 delete_input_buffer (void *buf)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1373 {
2861 6dcb8e1c9bb2 [project @ 1997-04-13 23:21:38 by jwe] jwe parents: 2857 diff changeset	1374 delete_buffer (static_cast<YY_BUFFER_STATE> (buf));
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1375 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1376
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1377 static bool
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1378 inside_any_object_index (void)
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1379 {
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1380 bool retval = false;
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1381
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1382 for (std::list<bool>::const_iterator i = lexer_flags.looking_at_object_index.begin ();
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1383 i != lexer_flags.looking_at_object_index.end (); i++)
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1384 {
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1385 if (*i)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1386 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1387 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1388 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1389 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1390 }
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1391
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1392 return retval;
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1393 }
6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1394
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	1395 // 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	1396
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1397 static int
4867 c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe] jwe parents: 4765 diff changeset	1398 is_keyword_token (const std::string& s)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1399 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1400 int l = lexer_flags.input_line_number;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1401 int c = lexer_flags.current_input_column;
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: 3802 diff changeset	1402
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	1403 int len = s.length ();
922 708827b941b4 [project @ 1994-11-14 22:14:13 by jwe] jwe parents: 916 diff changeset	1404
5088 7830f271a53f [project @ 2004-12-01 19:54:45 by jwe] jwe parents: 5035 diff changeset	1405 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	1406
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1407 if (kw)
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 120 diff changeset	1408 {
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1409 yylval.tok_val = 0;
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1410
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1411 switch (kw->kw_id)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1412 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1413 case break_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1414 case catch_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1415 case continue_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1416 case else_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1417 case otherwise_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1418 case return_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1419 case unwind_protect_cleanup_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1420 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1421 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1422
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1423 case static_kw:
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1424 if ((reading_fcn_file \|\| reading_script_file
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1425 \|\| reading_classdef_file)
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1426 && ! curr_fcn_file_full_name.empty ())
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1427 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	1428 "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'",
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1429 lexer_flags.input_line_number,
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1430 curr_fcn_file_full_name.c_str ());
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1431 else
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1432 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	1433 "the 'static' keyword is obsolete and will be removed from a future version of Octave; please use 'persistent' instead; near line %d",
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1434 lexer_flags.input_line_number);
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1435 // fall through ...
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1436
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1437 case persistent_kw:
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1438 break;
9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	1439
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1440 case case_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1441 case elseif_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1442 case global_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1443 case until_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1444 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1445
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1446 case end_kw:
14645 cbc00b587f36 also allow "end" indexing in classdef files John W. Eaton <jwe@octave.org> parents: 14642 diff changeset	1447 if (inside_any_object_index ()
cbc00b587f36 also allow "end" indexing in classdef files John W. Eaton <jwe@octave.org> parents: 14642 diff changeset	1448 \|\| (! reading_classdef_file
cbc00b587f36 also allow "end" indexing in classdef files John W. Eaton <jwe@octave.org> parents: 14642 diff changeset	1449 && (lexer_flags.defining_func
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1450 && ! (lexer_flags.looking_at_return_list
14647 7c463e490062 * lex.ll: fix paren mismatch problem in previous change. John W. Eaton <jwe@octave.org> parents: 14645 diff changeset	1451 \|\| lexer_flags.parsed_function_name.top ()))))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1452 return 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1453
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1454 yylval.tok_val = new token (token::simple_end, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1455 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1456 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1457
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1458 case end_try_catch_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1459 yylval.tok_val = new token (token::try_catch_end, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1460 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1461 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1462
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1463 case end_unwind_protect_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1464 yylval.tok_val = new token (token::unwind_protect_end, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1465 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1466 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1467
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1468 case endfor_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1469 yylval.tok_val = new token (token::for_end, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1470 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1471 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1472
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1473 case endfunction_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1474 yylval.tok_val = new token (token::function_end, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1475 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1476 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1477
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1478 case endif_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1479 yylval.tok_val = new token (token::if_end, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1480 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1481 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1482
13246 0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	1483 case endparfor_kw:
0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	1484 yylval.tok_val = new token (token::parfor_end, l, c);
0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	1485 lexer_flags.at_beginning_of_statement = true;
0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	1486 break;
0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	1487
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1488 case endswitch_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1489 yylval.tok_val = new token (token::switch_end, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1490 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1491 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1492
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1493 case endwhile_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1494 yylval.tok_val = new token (token::while_end, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1495 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1496 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1497
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1498 case endclassdef_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1499 yylval.tok_val = new token (token::classdef_end, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1500 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1501 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1502
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1503 case endenumeration_kw:
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1504 yylval.tok_val = new token (token::enumeration_end, l, c);
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1505 lexer_flags.at_beginning_of_statement = true;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1506 break;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1507
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1508 case endevents_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1509 yylval.tok_val = new token (token::events_end, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1510 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1511 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1512
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1513 case endmethods_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1514 yylval.tok_val = new token (token::methods_end, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1515 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1516 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1517
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1518 case endproperties_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1519 yylval.tok_val = new token (token::properties_end, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1520 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1521 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1522
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	1523
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1524 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	1525 case parfor_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1526 case while_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1527 promptflag--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1528 lexer_flags.looping++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1529 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1530
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1531 case do_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1532 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1533 promptflag--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1534 lexer_flags.looping++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1535 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1536
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1537 case try_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1538 case unwind_protect_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1539 lexer_flags.at_beginning_of_statement = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1540 promptflag--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1541 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1542
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1543 case if_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1544 case switch_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1545 promptflag--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1546 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1547
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1548 case get_kw:
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1549 case set_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1550 // 'get' and 'set' are keywords in classdef method
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1551 // declarations.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1552 if (! lexer_flags.maybe_classdef_get_set_method)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1553 return 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1554 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1555
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1556 case enumeration_kw:
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1557 case events_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1558 case methods_kw:
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1559 case properties_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1560 // 'properties', 'methods' and 'events' are keywords for
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1561 // classdef blocks.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1562 if (! lexer_flags.parsing_classdef)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1563 return 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1564 // fall through ...
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1565
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1566 case classdef_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1567 // 'classdef' is always a keyword.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1568 promptflag--;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1569 break;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1570
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1571 case function_kw:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1572 promptflag--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1573
11367 b2191ebea12f don't process input_event_hook when we are parsing a function John W. Eaton <jwe@octave.org> parents: 11217 diff changeset	1574 lexer_flags.defining_func++;
11464 21b5284fa78d avoid error when parsing nested functions John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1575 lexer_flags.parsed_function_name.push (false);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1576
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1577 if (! (reading_fcn_file \|\| reading_script_file
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1578 \|\| reading_classdef_file))
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1579 lexer_flags.input_line_number = 1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1580 break;
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1581
3174 390d5e396682 [project @ 1998-05-04 16:36:17 by jwe] jwe parents: 3165 diff changeset	1582 case magic_file_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1583 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1584 if ((reading_fcn_file \|\| reading_script_file
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1585 \|\| reading_classdef_file)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1586 && ! curr_fcn_file_full_name.empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1587 yylval.tok_val = new token (curr_fcn_file_full_name, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1588 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1589 yylval.tok_val = new token ("stdin", l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1590 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1591 break;
3174 390d5e396682 [project @ 1998-05-04 16:36:17 by jwe] jwe parents: 3165 diff changeset	1592
390d5e396682 [project @ 1998-05-04 16:36:17 by jwe] jwe parents: 3165 diff changeset	1593 case magic_line_kw:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1594 yylval.tok_val = new token (static_cast<double> (l), "", l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1595 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1596
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1597 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1598 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1599 }
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1600
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1601 if (! yylval.tok_val)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1602 yylval.tok_val = new token (l, c);
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1603
476 de9de43ad21f [project @ 1994-06-24 16:17:47 by jwe] jwe parents: 446 diff changeset	1604 token_stack.push (yylval.tok_val);
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1605
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	1606 return kw->tok;
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 120 diff changeset	1607 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1608
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1609 return 0;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1610 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1611
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	1612 static bool
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	1613 is_variable (const std::string& name)
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	1614 {
8001 ff9e7873f8ea improve handling of command-style names in matrix_or_assign_lhs context John W. Eaton <jwe@octave.org> parents: 7898 diff changeset	1615 return (symbol_table::is_variable (name)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1616 \|\| (lexer_flags.pending_local_variables.find (name)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1617 != lexer_flags.pending_local_variables.end ()));
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	1618 }
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	1619
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1620 static std::string
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1621 grab_block_comment (stream_reader& reader, bool& eof)
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1622 {
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1623 std::string buf;
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1624
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1625 bool at_bol = true;
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1626 bool look_for_marker = false;
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1627
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1628 bool warned_incompatible = false;
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1629
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1630 int c = 0;
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1631
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1632 while ((c = reader.getc ()) != EOF)
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1633 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1634 lexer_flags.current_input_column++;
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1635
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1636 if (look_for_marker)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1637 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1638 at_bol = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1639 look_for_marker = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1640
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1641 if (c == '{' \|\| c == '}')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1642 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1643 std::string tmp_buf (1, static_cast<char> (c));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1644
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1645 int type = c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1646
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1647 bool done = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1648
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1649 while ((c = reader.getc ()) != EOF && ! done)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1650 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1651 lexer_flags.current_input_column++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1652
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1653 switch (c)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1654 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1655 case ' ':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1656 case '\t':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1657 tmp_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1658 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1659
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1660 case '\n':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1661 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1662 lexer_flags.current_input_column = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1663 at_bol = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1664 done = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1665
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1666 if (type == '{')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1667 {
16105 b7de58feb2d3 move block_comment_nesting_level to lexical_feedback_class John W. Eaton <jwe@octave.org> parents: 16104 diff changeset	1668 lexer_flags.block_comment_nesting_level++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1669 promptflag--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1670 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1671 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1672 {
16105 b7de58feb2d3 move block_comment_nesting_level to lexical_feedback_class John W. Eaton <jwe@octave.org> parents: 16104 diff changeset	1673 lexer_flags.block_comment_nesting_level--;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1674 promptflag++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1675
16105 b7de58feb2d3 move block_comment_nesting_level to lexical_feedback_class John W. Eaton <jwe@octave.org> parents: 16104 diff changeset	1676 if (lexer_flags.block_comment_nesting_level == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1677 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1678 buf += grab_comment_block (reader, true, eof);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1679
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1680 return buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1681 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1682 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1683 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1684 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1685
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1686 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1687 at_bol = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1688 tmp_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1689 buf += tmp_buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1690 done = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1691 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1692 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1693 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1694 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1695 }
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1696
7898 cce16b4e0970 lex.l (grab_block_comment): Use parens around \|\| expression within && expression John W. Eaton <jwe@octave.org> parents: 7728 diff changeset	1697 if (at_bol && (c == '%' \|\| c == '#'))
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1698 {
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1699 if (c == '#' && ! warned_incompatible)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1700 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1701 warned_incompatible = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1702 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1703 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1704
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1705 at_bol = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1706 look_for_marker = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1707 }
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1708 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1709 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1710 buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1711
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1712 if (c == '\n')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1713 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1714 lexer_flags.current_input_column = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1715 at_bol = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1716 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1717 }
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1718 }
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1719
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1720 if (c == EOF)
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1721 eof = true;
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1722
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1723 return buf;
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1724 }
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1725
7720 4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1726 std::string
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1727 grab_comment_block (stream_reader& reader, bool at_bol,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1728 bool& eof)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1729 {
4426 51a0dcde8778 [project @ 2003-06-13 19:16:37 by jwe] jwe parents: 4410 diff changeset	1730 std::string buf;
1019 7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe] jwe parents: 1009 diff changeset	1731
7720 4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1732 // TRUE means we are at the beginning of a comment block.
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1733 bool begin_comment = false;
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1734
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1735 // TRUE means we are currently reading a comment block.
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1736 bool in_comment = false;
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1737
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1738 bool warned_incompatible = false;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	1739
1019 7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe] jwe parents: 1009 diff changeset	1740 int c = 0;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1741
7720 4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1742 while ((c = reader.getc ()) != EOF)
1019 7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe] jwe parents: 1009 diff changeset	1743 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1744 lexer_flags.current_input_column++;
7720 4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1745
2300 9484969866d2 [project @ 1996-06-24 07:13:26 by jwe] jwe parents: 2200 diff changeset	1746 if (begin_comment)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1747 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1748 if (c == '%' \|\| c == '#')
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 at_bol = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1751 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1752 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1753 else if (at_bol && c == '{')
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 std::string tmp_buf (1, static_cast<char> (c));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1756
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1757 bool done = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1758
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1759 while ((c = reader.getc ()) != EOF && ! done)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1760 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1761 lexer_flags.current_input_column++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1762
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1763 switch (c)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1764 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1765 case ' ':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1766 case '\t':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1767 tmp_buf += static_cast<char> (c);
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 '\n':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1771 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1772 lexer_flags.current_input_column = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1773 at_bol = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1774 done = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1775
16105 b7de58feb2d3 move block_comment_nesting_level to lexical_feedback_class John W. Eaton <jwe@octave.org> parents: 16104 diff changeset	1776 lexer_flags.block_comment_nesting_level++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1777 promptflag--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1778
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1779 buf += grab_block_comment (reader, eof);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1780
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1781 in_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1782
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1783 if (eof)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1784 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1785 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1786 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1787
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1788 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1789 at_bol = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1790 tmp_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1791 buf += tmp_buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1792 done = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1793 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1794 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1795 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1796 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1797 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1798 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1799 at_bol = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1800 begin_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1801 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1802 }
2300 9484969866d2 [project @ 1996-06-24 07:13:26 by jwe] jwe parents: 2200 diff changeset	1803
1019 7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe] jwe parents: 1009 diff changeset	1804 if (in_comment)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1805 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1806 buf += static_cast<char> (c);
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 if (c == '\n')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1809 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1810 at_bol = true;
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1811 lexer_flags.current_input_column = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1812 in_comment = false;
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 // FIXME -- bailing out here prevents things like
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1815 //
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1816 // octave> # comment
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1817 // octave> x = 1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1818 //
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1819 // from failing at the command line, while still
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1820 // allowing blocks of comments to be grabbed properly
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1821 // for function doc strings. But only the first line of
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1822 // a mult-line doc string will be picked up for
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1823 // functions defined on the command line. We need a
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1824 // better way of collecting these comments...
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1825 if (! (reading_fcn_file \|\| reading_script_file))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1826 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1827 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1828 }
1019 7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe] jwe parents: 1009 diff changeset	1829 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1830 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1831 switch (c)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1832 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1833 case ' ':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1834 case '\t':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1835 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1836
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1837 case '#':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1838 if (! warned_incompatible)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1839 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1840 warned_incompatible = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1841 maybe_gripe_matlab_incompatible_comment (c);
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 // fall through...
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1844
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1845 case '%':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1846 in_comment = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1847 begin_comment = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1848 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1849
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1850 default:
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1851 lexer_flags.current_input_column--;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1852 reader.ungetc (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1853 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1854 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1855 }
1019 7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe] jwe parents: 1009 diff changeset	1856 }
991 18be848f10a9 [project @ 1994-12-15 06:06:46 by jwe] jwe parents: 985 diff changeset	1857
1019 7a632c749c67 [project @ 1995-01-09 18:58:33 by jwe] jwe parents: 1009 diff changeset	1858 done:
991 18be848f10a9 [project @ 1994-12-15 06:06:46 by jwe] jwe parents: 985 diff changeset	1859
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1860 if (c == EOF)
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1861 eof = true;
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1862
4426 51a0dcde8778 [project @ 2003-06-13 19:16:37 by jwe] jwe parents: 4410 diff changeset	1863 return buf;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1864 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1865
7720 4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1866 class
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1867 flex_stream_reader : public stream_reader
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1868 {
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1869 public:
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1870 flex_stream_reader (char *buf_arg) : stream_reader (), buf (buf_arg) { }
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1871
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	1872 int getc (void) { return ::text_yyinput (); }
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1873 int ungetc (int c) { ::xunput (c, buf); return 0; }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1874
7720 4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1875 private:
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	1876
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	1877 // No copying!
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	1878
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	1879 flex_stream_reader (const flex_stream_reader&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	1880
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	1881 flex_stream_reader& operator = (const flex_stream_reader&);
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	1882
7720 4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1883 char *buf;
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1884 };
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1885
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1886 static int
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1887 process_comment (bool start_in_block, bool& eof)
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1888 {
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1889 eof = false;
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1890
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1891 std::string help_txt;
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1892
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1893 if (! help_buf.empty ())
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1894 help_txt = help_buf.top ();
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1895
7720 4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1896 flex_stream_reader flex_reader (yytext);
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1897
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1898 // process_comment is only supposed to be called when we are not
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1899 // initially looking at a block comment.
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1900
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1901 std::string txt = start_in_block
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1902 ? grab_block_comment (flex_reader, eof)
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	1903 : grab_comment_block (flex_reader, false, eof);
7720 4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1904
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1905 if (lexer_debug_flag)
8536 de1b944d5306 lex.l: finish previous change John W. Eaton <jwe@octave.org> parents: 8535 diff changeset	1906 std::cerr << "C: " << txt << std::endl;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1907
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	1908 if (help_txt.empty () && lexer_flags.nesting_level.none ())
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1909 {
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1910 if (! help_buf.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1911 help_buf.pop ();
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1912
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1913 help_buf.push (txt);
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1914 }
7720 4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1915
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	1916 octave_comment_buffer::append (txt);
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1917
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	1918 lexer_flags.current_input_column = 1;
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1919 lexer_flags.quote_is_transpose = false;
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1920 lexer_flags.convert_spaces_to_comma = true;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	1921 lexer_flags.at_beginning_of_statement = true;
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1922
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1923 if (YY_START == COMMAND_START)
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1924 BEGIN (INITIAL);
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1925
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	1926 if (lexer_flags.nesting_level.none ())
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	1927 return '\n';
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	1928 else if (lexer_flags.nesting_level.is_bracket_or_brace ())
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1929 return ';';
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1930 else
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1931 return 0;
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1932 }
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	1933
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1934 // Return 1 if the given character matches any character in the given
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1935 // string.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1936
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1937 static bool
2804 eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe] jwe parents: 2764 diff changeset	1938 match_any (char c, const char *s)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1939 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1940 char tmp;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1941 while ((tmp = *s++) != '\0')
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1942 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1943 if (c == tmp)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1944 return true;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1945 }
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1946 return false;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1947 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1948
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1949 // Given information about the spacing surrounding an operator,
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1950 // return 1 if it looks like it should be treated as a binary
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1951 // operator. For example,
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1952 //
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	1953 // [ 1 + 2 ] or [ 1+ 2] or [ 1+2 ] ==> binary
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	1954 //
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	1955 // [ 1 +2 ] ==> unary
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1956
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1957 static bool
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1958 looks_like_bin_op (bool spc_prev, int next_char)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1959 {
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1960 bool spc_next = (next_char == ' ' \|\| next_char == '\t');
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1961
608 a675e03540dd [project @ 1994-08-13 23:50:19 by jwe] jwe parents: 584 diff changeset	1962 return ((spc_prev && spc_next) \|\| ! spc_prev);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1963 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1964
3263 7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1965 // 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	1966 // replaced by a single LF.
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1967
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1968 static bool
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1969 next_token_is_sep_op (void)
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1970 {
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1971 bool retval = false;
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1972
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	1973 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	1974
13820b9f5fd9 more consistent handling of CR/CRLF/LF line endings in lexer and parser John W. Eaton <jwe@octave.org> parents: 7723 diff changeset	1975 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	1976
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1977 xunput (c, yytext);
3263 7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1978
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1979 return retval;
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1980 }
7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	1981
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	1982 // 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	1983 // 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	1984
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1985 static bool
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1986 next_token_is_postfix_unary_op (bool spc_prev)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1987 {
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1988 bool un_op = false;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1989
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	1990 int c0 = text_yyinput ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1991
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1992 if (c0 == '\'' && ! spc_prev)
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1993 {
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1994 un_op = true;
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1995 }
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1996 else if (c0 == '.')
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1997 {
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	1998 int c1 = text_yyinput ();
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	1999 un_op = (c1 == '\'');
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2000 xunput (c1, yytext);
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2001 }
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2002 else if (c0 == '+')
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2003 {
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	2004 int c1 = text_yyinput ();
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2005 un_op = (c1 == '+');
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2006 xunput (c1, yytext);
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2007 }
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2008 else if (c0 == '-')
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2009 {
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	2010 int c1 = text_yyinput ();
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2011 un_op = (c1 == '-');
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2012 xunput (c1, yytext);
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2013 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2014
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2015 xunput (c0, yytext);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2016
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2017 return un_op;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2018 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2019
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	2020 // 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	2021 // operator.
1521 b3e4ca4f75a0 [project @ 1995-10-04 05:10:36 by jwe] jwe parents: 1520 diff changeset	2022 //
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2023 // 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	2024 // 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	2025 // 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	2026 // 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	2027 //
3779 3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3774 diff changeset	2028 // 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	2029 // (e.g., the characters '[' 'a' ' ' '+' '\' LFD 'b' ']') will be
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3774 diff changeset	2030 // parsed as a binary operator.
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	2031
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2032 static bool
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2033 next_token_is_bin_op (bool spc_prev)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2034 {
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2035 bool bin_op = false;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2036
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	2037 int c0 = text_yyinput ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2038
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2039 switch (c0)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2040 {
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 767 diff changeset	2041 case '+':
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 767 diff changeset	2042 case '-':
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2043 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2044 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2045
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2046 switch (c1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2047 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2048 case '+':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2049 case '-':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2050 // Unary ops, spacing doesn't matter.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2051 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2052
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2053 case '=':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2054 // Binary ops, spacing doesn't matter.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2055 bin_op = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2056 break;
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 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2059 // Could be either, spacing matters.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2060 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	2061 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2062 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2063
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2064 xunput (c1, yytext);
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2065 }
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2066 break;
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2067
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2068 case ':':
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2069 case '/':
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2070 case '\\':
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2071 case '^':
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2072 // Always a binary op (may also include /=, \=, and ^=).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2073 bin_op = true;
1276 cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe] jwe parents: 1273 diff changeset	2074 break;
cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe] jwe parents: 1273 diff changeset	2075
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2076 // .+ .- ./ .\ .^ .* .**
1554 b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe] jwe parents: 1521 diff changeset	2077 case '.':
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe] jwe parents: 1521 diff changeset	2078 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2079 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2080
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2081 if (match_any (c1, "+-/\\^*"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2082 // Always a binary op (may also include .+=, .-=, ./=, ...).
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2083 bin_op = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2084 else if (! isdigit (c1) && c1 != ' ' && c1 != '\t' && c1 != '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2085 // A structure element reference is a binary op.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2086 bin_op = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2087
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2088 xunput (c1, yytext);
1554 b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe] jwe parents: 1521 diff changeset	2089 }
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe] jwe parents: 1521 diff changeset	2090 break;
b1ba1894bccc [project @ 1995-10-09 13:31:42 by jwe] jwe parents: 1521 diff changeset	2091
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2092 // = == & && \| \|\| * **
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2093 case '=':
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2094 case '&':
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2095 case '\|':
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2096 case '*':
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2097 // Always a binary op (may also include ==, &&, \|\|, **).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2098 bin_op = true;
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2099 break;
a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2100
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2101 // < <= <> > >=
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2102 case '<':
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2103 case '>':
3774 de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2104 // Always a binary op (may also include <=, <>, >=).
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2105 bin_op = true;
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2106 break;
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2107
de61a7ba91f2 [project @ 2001-02-05 16:54:04 by jwe] jwe parents: 3698 diff changeset	2108 // ~= !=
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 767 diff changeset	2109 case '~':
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 767 diff changeset	2110 case '!':
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2111 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2112 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2113
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2114 // ~ and ! can be unary ops, so require following =.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2115 if (c1 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2116 bin_op = true;
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 xunput (c1, yytext);
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2119 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2120 break;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2121
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2122 default:
1276 cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe] jwe parents: 1273 diff changeset	2123 break;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2124 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2125
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2126 xunput (c0, yytext);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2127
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2128 return bin_op;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2129 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2130
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	2131 // Used to delete trailing white space from tokens.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	2132
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3523 diff changeset	2133 static std::string
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2134 strip_trailing_whitespace (char *s)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2135 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	2136 std::string retval = s;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2137
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	2138 size_t pos = retval.find_first_of (" \t");
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2139
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	2140 if (pos != std::string::npos)
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	2141 retval.resize (pos);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2142
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2143 return retval;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2144 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2145
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	2146 // 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	2147
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2148 static void
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2149 scan_for_comments (const char *text)
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2150 {
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2151 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2152
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2153 bool in_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2154 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2155
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2156 int len = strlen (text);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2157 int i = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2158
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2159 while (i < len)
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2160 {
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2161 char c = text[i++];
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2162
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2163 switch (c)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2164 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2165 case '%':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2166 case '#':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2167 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2168 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2169 if (! beginning_of_comment)
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 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2172 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2173 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2174 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2175 in_comment = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2176 beginning_of_comment = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2177 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2178 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2179
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2180 case '\n':
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 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2184 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2185 comment_buf.resize (0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2186 in_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2187 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2188 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2189 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2190
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2191 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2192 if (in_comment)
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 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2195 beginning_of_comment = false;
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 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2198 }
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2199 }
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2200
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2201 if (! comment_buf.empty ())
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2202 octave_comment_buffer::append (comment_buf);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2203 }
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2204
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2205 // Discard whitespace, including comments and continuations.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2206
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	2207 // 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	2208
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	2209 static int
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2210 eat_whitespace (void)
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2211 {
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	2212 int retval = lexical_feedback::NO_WHITESPACE;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2213
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2214 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2215
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2216 bool in_comment = false;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2217 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2218
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2219 int c = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2220
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	2221 while ((c = text_yyinput ()) != EOF)
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2222 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	2223 lexer_flags.current_input_column++;
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2224
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2225 switch (c)
10315 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 case ' ':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2228 case '\t':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2229 if (in_comment)
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 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2232 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2233 }
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	2234 retval \|= lexical_feedback::SPACE_OR_TAB;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2235 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2236
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2237 case '\n':
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	2238 retval \|= lexical_feedback::NEWLINE;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2239 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2240 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2241 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2242 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2243 comment_buf.resize (0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2244 in_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2245 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2246 }
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	2247 lexer_flags.current_input_column = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2248 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2249
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2250 case '#':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2251 case '%':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2252 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2253 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2254 if (! beginning_of_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2255 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2256 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2257 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2258 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2259 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2260 in_comment = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2261 beginning_of_comment = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2262 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2263 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2264
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2265 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2266 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2267 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2268 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2269 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2270 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2271 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2272 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2273 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2274 if (have_ellipsis_continuation ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2275 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2276 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2277 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2278 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2279
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2280 case '\\':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2281 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2282 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2283 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2284 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2285 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2286 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2287 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2288 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2289 if (have_continuation ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2290 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2291 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2292 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2293 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2294
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2295 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2296 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2297 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2298 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2299 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2300 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2301 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2302 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2303 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2304 }
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2305 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2306
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2307 if (! comment_buf.empty ())
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2308 octave_comment_buffer::append (comment_buf);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2309
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2310 done:
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2311 xunput (c, yytext);
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	2312 lexer_flags.current_input_column--;
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2313 return retval;
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2314 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2315
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2316 static inline bool
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2317 looks_like_hex (const char *s, int len)
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2318 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2319 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	2320 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2321
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	2322 static void
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2323 handle_number (void)
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2324 {
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2325 double value = 0.0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2326 int nread = 0;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2327
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2328 if (looks_like_hex (yytext, strlen (yytext)))
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2329 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2330 unsigned long ival;
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2331
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2332 nread = sscanf (yytext, "%lx", &ival);
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2333
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2334 value = static_cast<double> (ival);
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2335 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2336 else
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2337 {
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2338 char *tmp = strsave (yytext);
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2339
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2340 char *idx = strpbrk (tmp, "Dd");
2621 337a09dd1c06 [project @ 1997-01-24 21:49:41 by jwe] jwe parents: 2614 diff changeset	2341
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2342 if (idx)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2343 *idx = 'e';
3598 0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2344
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2345 nread = sscanf (tmp, "%lf", &value);
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2346
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2347 delete [] tmp;
0ae310231c46 [project @ 2000-02-19 08:07:08 by jwe] jwe parents: 3575 diff changeset	2348 }
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2349
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	2350 // 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	2351
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2352 assert (nread == 1);
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2353
3988 9a73d0e7e737 [project @ 2002-07-12 19:25:04 by jwe] jwe parents: 3985 diff changeset	2354 lexer_flags.quote_is_transpose = true;
9a73d0e7e737 [project @ 2002-07-12 19:25:04 by jwe] jwe parents: 3985 diff changeset	2355 lexer_flags.convert_spaces_to_comma = true;
11217 521373e25613 correctly parse {1 2 {3 4}} John W. Eaton <jwe@octave.org> parents: 10426 diff changeset	2356 lexer_flags.looking_for_object_index = false;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2357 lexer_flags.at_beginning_of_statement = false;
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2358
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	2359 yylval.tok_val = new token (value, yytext, lexer_flags.input_line_number,
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	2360 lexer_flags.current_input_column);
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2361
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2362 token_stack.push (yylval.tok_val);
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2363
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	2364 lexer_flags.current_input_column += yyleng;
972 3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2365
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2366 do_comma_insert_check ();
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2367 }
3e25eb05b6c6 [project @ 1994-12-12 15:53:47 by jwe] jwe parents: 971 diff changeset	2368
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2369 // 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	2370 // 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	2371 // and including the new line character.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2372 //
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2373 // 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	2374 // 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	2375 // If non-whitespace characters are found before comment
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2376 // characters, return 0. Otherwise, return 1.
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2377
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	2378 // 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	2379
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2380 static bool
3096 ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe] jwe parents: 3079 diff changeset	2381 have_continuation (bool trailing_comments_ok)
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2382 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5615 diff changeset	2383 std::ostringstream buf;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2384
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2385 std::string comment_buf;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2386
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2387 bool in_comment = false;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2388 bool beginning_of_comment = false;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2389
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2390 int c = 0;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2391
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	2392 while ((c = text_yyinput ()) != EOF)
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2393 {
3802 4f1a26a730fd [project @ 2001-02-26 20:26:14 by jwe] jwe parents: 3796 diff changeset	2394 buf << static_cast<char> (c);
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2395
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2396 switch (c)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2397 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2398 case ' ':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2399 case '\t':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2400 if (in_comment)
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 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2403 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2404 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2405 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2406
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2407 case '%':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2408 case '#':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2409 if (trailing_comments_ok)
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 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2412 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2413 if (! beginning_of_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2414 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2415 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2416 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2417 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2418 maybe_gripe_matlab_incompatible_comment (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2419 in_comment = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2420 beginning_of_comment = true;
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 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2423 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2424 goto cleanup;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2425 break;
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 case '\n':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2428 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2429 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2430 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2431 octave_comment_buffer::append (comment_buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2432 }
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	2433 lexer_flags.current_input_column = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2434 promptflag--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2435 gripe_matlab_incompatible_continuation ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2436 return true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2437
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2438 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2439 if (in_comment)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2440 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2441 comment_buf += static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2442 beginning_of_comment = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2443 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2444 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2445 goto cleanup;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2446 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2447 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2448 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2449
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2450 xunput (c, yytext);
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2451 return false;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2452
3096 ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe] jwe parents: 3079 diff changeset	2453 cleanup:
4051 b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe] jwe parents: 4037 diff changeset	2454
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5615 diff changeset	2455 std::string s = buf.str ();
4051 b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe] jwe parents: 4037 diff changeset	2456
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe] jwe parents: 4037 diff changeset	2457 int len = s.length ();
b79da8779a0e [project @ 2002-08-17 19:38:32 by jwe] jwe parents: 4037 diff changeset	2458 while (len--)
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2459 xunput (s[len], yytext);
3096 ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe] jwe parents: 3079 diff changeset	2460
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2461 return false;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2462 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2463
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	2464 // 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	2465 // 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	2466 // line character.
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2467
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2468 static bool
3096 ff8b4d6371b3 [project @ 1997-11-14 07:59:14 by jwe] jwe parents: 3079 diff changeset	2469 have_ellipsis_continuation (bool trailing_comments_ok)
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2470 {
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	2471 char c1 = text_yyinput ();
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2472 if (c1 == '.')
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2473 {
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	2474 char c2 = text_yyinput ();
1091 54abf1b3a8e9 [project @ 1995-02-02 00:30:14 by jwe] jwe parents: 1088 diff changeset	2475 if (c2 == '.' && have_continuation (trailing_comments_ok))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2476 return true;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2477 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2478 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2479 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2480 xunput (c1, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2481 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2482 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2483 else
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2484 xunput (c1, yytext);
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2485
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2486 return false;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2487 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2488
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2489 // 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	2490 // 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	2491
031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	2492 static int
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2493 eat_continuation (void)
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2494 {
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	2495 int retval = lexical_feedback::NO_WHITESPACE;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2496
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	2497 int c = text_yyinput ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	2498
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2499 if ((c == '.' && have_ellipsis_continuation ())
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3103 diff changeset	2500 \|\| (c == '\\' && have_continuation ()))
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2501 retval = eat_whitespace ();
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2502 else
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2503 xunput (c, yytext);
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2504
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2505 return retval;
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2506 }
641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2507
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2508 static int
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2509 handle_string (char delim)
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2510 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5615 diff changeset	2511 std::ostringstream buf;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2512
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	2513 int bos_line = lexer_flags.input_line_number;
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	2514 int bos_col = lexer_flags.current_input_column;
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: 3802 diff changeset	2515
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2516 int c;
1031 59f5eb2d5eb3 [project @ 1995-01-15 21:11:11 by jwe] jwe parents: 1019 diff changeset	2517 int escape_pending = 0;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2518
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	2519 while ((c = text_yyinput ()) != EOF)
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2520 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	2521 lexer_flags.current_input_column++;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2522
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3103 diff changeset	2523 if (c == '\\')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2524 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2525 if (delim == '\'' \|\| escape_pending)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2526 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2527 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2528 escape_pending = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2529 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2530 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2531 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2532 if (have_continuation (false))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2533 escape_pending = 0;
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 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2537 escape_pending = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2538 }
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 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2541 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2542 else if (c == '.')
10315 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 if (delim == '\'' \|\| ! have_ellipsis_continuation (false))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2545 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2546 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2547 else if (c == '\n')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2548 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2549 error ("unterminated string constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2550 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2551 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2552 else if (c == delim)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2553 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2554 if (escape_pending)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2555 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2556 else
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 c = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2559 if (c == delim)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2560 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2561 buf << static_cast<char> (c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2562 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2563 else
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 std::string s;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2566 xunput (c, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2567
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2568 if (delim == '\'')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2569 s = buf.str ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2570 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2571 s = do_string_escapes (buf.str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2572
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2573 lexer_flags.quote_is_transpose = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2574 lexer_flags.convert_spaces_to_comma = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2575
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2576 yylval.tok_val = new token (s, bos_line, bos_col);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2577 token_stack.push (yylval.tok_val);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2578
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2579 if (delim == '"')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2580 gripe_matlab_incompatible ("\" used as string delimiter");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2581 else if (delim == '\'')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2582 gripe_single_quote_string ();
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	2583
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2584 lexer_flags.looking_for_object_index = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2585 lexer_flags.at_beginning_of_statement = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2586
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2587 return delim == '"' ? DQ_STRING : SQ_STRING;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2588 }
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 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2591 else
10315 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 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2594 }
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2595
1031 59f5eb2d5eb3 [project @ 1995-01-15 21:11:11 by jwe] jwe parents: 1019 diff changeset	2596 escape_pending = 0;
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2597 }
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2598
46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	2599 return LEXICAL_ERROR;
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
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2602 static bool
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2603 next_token_is_assign_op (void)
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2604 {
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2605 bool retval = false;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2606
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	2607 int c0 = text_yyinput ();
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2608
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2609 switch (c0)
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2610 {
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2611 case '=':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2612 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2613 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2614 xunput (c1, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2615 if (c1 != '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2616 retval = true;
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2617 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2618 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2619
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2620 case '+':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2621 case '-':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2622 case '*':
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 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2628 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2629 xunput (c1, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2630 if (c1 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2631 retval = true;
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2632 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2633 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2634
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2635 case '.':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2636 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2637 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2638 if (match_any (c1, "+-*/\\"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2639 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2640 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2641 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2642 if (c2 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2643 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2644 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2645 xunput (c1, yytext);
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2646 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2647 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2648
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2649 case '>':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2650 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2651 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2652 if (c1 == '>')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2653 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2654 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2655 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2656 if (c2 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2657 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2658 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2659 xunput (c1, yytext);
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2660 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2661 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2662
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2663 case '<':
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2664 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2665 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2666 if (c1 == '<')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2667 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2668 int c2 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2669 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2670 if (c2 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2671 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2672 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2673 xunput (c1, yytext);
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2674 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2675 break;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2676
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2677 default:
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
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2681 xunput (c0, yytext);
3208 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 return retval;
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2684 }
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2685
4633 d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2686 static bool
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2687 next_token_is_index_op (void)
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2688 {
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	2689 int c = text_yyinput ();
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2690 xunput (c, yytext);
4633 d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2691 return c == '(' \|\| c == '{';
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2692 }
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2693
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4608 diff changeset	2694 static int
d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4608 diff changeset	2695 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	2696 {
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4608 diff changeset	2697 int retval = bracket_type;
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2698
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	2699 if (! lexer_flags.nesting_level.none ())
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2700 {
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	2701 lexer_flags.nesting_level.remove ();
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2702
d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2703 if (bracket_type == ']')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2704 lexer_flags.bracketflag--;
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2705 else if (bracket_type == '}')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2706 lexer_flags.braceflag--;
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2707 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2708 panic_impossible ();
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2709 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2710
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2711 if (lexer_flags.bracketflag == 0 && lexer_flags.braceflag == 0)
4323 0990c9b77109 [project @ 2003-02-14 07:36:26 by jwe] jwe parents: 4318 diff changeset	2712 BEGIN (INITIAL);
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	2713
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	2714 if (bracket_type == ']'
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	2715 && next_token_is_assign_op ()
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	2716 && ! lexer_flags.looking_at_return_list)
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2717 {
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2718 retval = CLOSE_BRACE;
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2719 }
4613 d1786f2d8a3c [project @ 2003-11-14 22:46:19 by jwe] jwe parents: 4612 diff changeset	2720 else if ((lexer_flags.bracketflag \|\| lexer_flags.braceflag)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2721 && lexer_flags.convert_spaces_to_comma
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	2722 && (lexer_flags.nesting_level.is_bracket ()
c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	2723 \|\| (lexer_flags.nesting_level.is_brace ()
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2724 && ! lexer_flags.looking_at_object_index.front ())))
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2725 {
4633 d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2726 bool index_op = next_token_is_index_op ();
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2727
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2728 // 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	2729 //
d95dd6ae89fd [project @ 2003-11-19 18:32:50 by jwe] jwe parents: 4613 diff changeset	2730 // [x{i}{j}] or [x{i}(j)]
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 // but do if we are looking at
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 // [x{i} {j}] or [x{i} (j)]
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 if (spc_gobbled \|\| ! (bracket_type == '}' && index_op))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2737 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2738 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	2739
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2740 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	2741
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2742 bool sep_op = next_token_is_sep_op ();
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 if (! (postfix_un_op \|\| bin_op \|\| 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 maybe_warn_separator_insert (',');
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 xunput (',', yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2749 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2750 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2751 }
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2752 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2753
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2754 lexer_flags.quote_is_transpose = true;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2755 lexer_flags.convert_spaces_to_comma = true;
3208 e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2756
e8a7163701be [project @ 1998-11-03 05:12:47 by jwe] jwe parents: 3204 diff changeset	2757 return retval;
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2758 }
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	2759
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2760 static void
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2761 maybe_unput_comma (int spc_gobbled)
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2762 {
16104 c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	2763 if (lexer_flags.nesting_level.is_bracket ()
c8974e28da59 move nesting_level to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16103 diff changeset	2764 \|\| (lexer_flags.nesting_level.is_brace ()
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2765 && ! lexer_flags.looking_at_object_index.front ()))
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2766 {
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2767 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	2768
3246 a41cc560087a [project @ 1999-06-19 06:46:20 by jwe] jwe parents: 3238 diff changeset	2769 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	2770
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	2771 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	2772 int c2 = text_yyinput ();
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	2773
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2774 xunput (c2, yytext);
adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	2775 xunput (c1, yytext);
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	2776
3263 7d80b56e0dc8 [project @ 1999-08-20 19:10:09 by jwe] jwe parents: 3258 diff changeset	2777 int sep_op = next_token_is_sep_op ();
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	2778
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2779 int dot_op = (c1 == '.'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2780 && (isalpha (c2) \|\| isspace (c2) \|\| c2 == '_'));
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	2781
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	2782 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	2783 return;
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	2784
3985 fa0ae9105656 [project @ 2002-07-11 04:02:00 by jwe] jwe parents: 3974 diff changeset	2785 int index_op = (c1 == '(' \|\| c1 == '{');
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	2786
4476 b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2787 // 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	2788 // a comma.
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2789
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2790 if (index_op && ! spc_gobbled)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2791 return;
4476 b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2792
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2793 maybe_warn_separator_insert (',');
b7360f8eb035 [project @ 2003-07-30 17:17:21 by jwe] jwe parents: 4426 diff changeset	2794
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	2795 xunput (',', yytext);
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2796 }
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2797 }
0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	2798
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2799 static bool
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2800 next_token_can_follow_bin_op (void)
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2801 {
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2802 std::stack<char> buf;
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 int c = EOF;
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 // Skip whitespace in current statement on current line
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2807 while (true)
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2808 {
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2809 c = text_yyinput ();
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2810
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	2811 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	2812
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 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	2814 break;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2815 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2816
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2817 // Restore input.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2818 while (! buf.empty ())
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2819 {
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2820 xunput (buf.top (), yytext);
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2821
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2822 buf.pop ();
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
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2825 return (isalnum (c) \|\| match_any (c, "!\"'(-[_{~"));
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
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2828 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	2829 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	2830 {
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2831 // 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	2832 // 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	2833
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2834 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	2835 \|\| 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	2836 \|\| 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	2837 \|\| 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	2838 \|\| 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	2839 }
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2840
5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	2841 static bool
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2842 looks_like_command_arg (void)
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2843 {
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2844 bool retval = true;
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 int c0 = text_yyinput ();
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 switch (c0)
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 // = ==
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2851 case '=':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2852 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2853 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2854
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2855 if (c1 == '=')
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 int c2 = text_yyinput ();
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 if (! match_any (c2, ",;\n") && (c2 == ' ' \|\| c2 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2860 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2861 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2862
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2863 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2864 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2865 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2866 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2867
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2868 xunput (c1, yytext);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2869 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2870 break;
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 case '(':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2873 case '{':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2874 // Indexing.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2875 retval = false;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2876 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2877
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2878 case '\n':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2879 // EOL.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2880 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2881
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2882 case '\'':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2883 case '"':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2884 // Beginning of a character string.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2885 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2886
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2887 // + - ++ -- += -=
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2888 case '+':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2889 case '-':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2890 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2891 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2892
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2893 switch (c1)
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 case '\n':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2896 // EOL.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2897 case '+':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2898 case '-':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2899 // Unary ops, spacing doesn't matter.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2900 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2901
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2902 case '\t':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2903 case ' ':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2904 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2905 if (next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2906 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2907 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2908 break;
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 case '=':
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 int c2 = text_yyinput ();
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 if (! match_any (c2, ",;\n") && (c2 == ' ' \|\| c2 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2915 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2916 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2917
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2918 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2919 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2920 break;
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2923 xunput (c1, yytext);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2924 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2925 break;
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 case ':':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2928 case '/':
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 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2932 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2933
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2934 if (! match_any (c1, ",;\n") && (c1 == ' ' \|\| c1 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2935 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2936 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2937
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2938 xunput (c1, yytext);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2939 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2940 break;
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 // .+ .- ./ .\ .^ .* .**
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2943 case '.':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2944 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2945 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2946
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2947 if (match_any (c1, "+-/\\^*"))
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 int c2 = text_yyinput ();
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 if (c2 == '=')
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 int c3 = text_yyinput ();
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 if (! match_any (c3, ",;\n") && (c3 == ' ' \|\| c3 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2956 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2957 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2958
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2959 xunput (c3, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2960 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2961 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	2962 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2963 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2964
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2965 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2966 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2967 else if (! match_any (c1, ",;\n")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2968 && (! isdigit (c1) && c1 != ' ' && c1 != '\t'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2969 && c1 != '.'))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2970 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2971 // Structure reference. FIXME -- is this a complete check?
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 retval = false;
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2976 xunput (c1, yytext);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2977 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2978 break;
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 // & && \| \|\| * **
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2981 case '&':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	2982 case '\|':
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 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2985 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2986
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2987 if (c1 == c0)
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 int c2 = text_yyinput ();
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 if (! match_any (c2, ",;\n") && (c2 == ' ' \|\| c2 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2992 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2993 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2994
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2995 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2996 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2997 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	2998 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2999 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3000
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3001 xunput (c1, yytext);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3002 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3003 break;
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 // < <= > >=
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3006 case '<':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3007 case '>':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3008 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3009 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3010
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3011 if (c1 == '=')
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 int c2 = text_yyinput ();
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 if (! match_any (c2, ",;\n") && (c2 == ' ' \|\| c2 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3016 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3017 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3018
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3019 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3020 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3021 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	3022 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3023 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3024
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3025 xunput (c1, yytext);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3026 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3027 break;
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 // ~= !=
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3030 case '~':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3031 case '!':
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3032 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3033 int c1 = text_yyinput ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3034
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3035 // ~ and ! can be unary ops, so require following =.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3036 if (c1 == '=')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3037 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3038 int c2 = text_yyinput ();
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 if (! match_any (c2, ",;\n") && (c2 == ' ' \|\| c2 == '\t')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3041 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3042 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3043
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3044 xunput (c2, yytext);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3045 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3046 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	3047 && next_token_can_follow_bin_op ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3048 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3049
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3050 xunput (c1, yytext);
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3051 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3052 break;
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 default:
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3055 break;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3056 }
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3057
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3058 xunput (c0, yytext);
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3059
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3060 return retval;
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
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3063 static int
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3064 handle_superclass_identifier (void)
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3065 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3066 eat_continuation ();
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3067
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3068 std::string pkg;
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3069 std::string meth = strip_trailing_whitespace (yytext);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3070 size_t pos = meth.find ("@");
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3071 std::string cls = meth.substr (pos).substr (1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3072 meth = meth.substr (0, pos - 1);
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3073
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3074 pos = cls.find (".");
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3075 if (pos != std::string::npos)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3076 {
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3077 pkg = cls.substr (pos).substr (1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3078 cls = cls.substr (0, pos - 1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3079 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3080
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3081 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	3082 \|\| is_keyword_token (pkg));
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3083 if (kw_token)
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3084 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3085 error ("method, class and package names may not be keywords");
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3086 return LEXICAL_ERROR;
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 yylval.tok_val
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3090 = new token (meth.empty () ? 0 : &(symbol_table::insert (meth)),
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3091 cls.empty () ? 0 : &(symbol_table::insert (cls)),
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3092 pkg.empty () ? 0 : &(symbol_table::insert (pkg)),
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3093 lexer_flags.input_line_number,
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3094 lexer_flags.current_input_column);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3095 token_stack.push (yylval.tok_val);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3096
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3097 lexer_flags.convert_spaces_to_comma = true;
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3098 lexer_flags.current_input_column += yyleng;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3099
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3100 return SUPERCLASSREF;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3101 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3102
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3103 static int
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3104 handle_meta_identifier (void)
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 eat_continuation ();
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3107
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3108 std::string pkg;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3109 std::string cls = strip_trailing_whitespace (yytext).substr (1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3110 size_t pos = cls.find (".");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3111
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3112 if (pos != std::string::npos)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3113 {
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3114 pkg = cls.substr (pos).substr (1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3115 cls = cls.substr (0, pos - 1);
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3116 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3117
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3118 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	3119 if (kw_token)
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3120 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3121 error ("class and package names may not be keywords");
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3122 return LEXICAL_ERROR;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3123 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3124
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3125 yylval.tok_val
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3126 = new token (cls.empty () ? 0 : &(symbol_table::insert (cls)),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3127 pkg.empty () ? 0 : &(symbol_table::insert (pkg)),
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3128 lexer_flags.input_line_number,
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3129 lexer_flags.current_input_column);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3130
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3131 token_stack.push (yylval.tok_val);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3132
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3133 lexer_flags.convert_spaces_to_comma = true;
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3134 lexer_flags.current_input_column += yyleng;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3135
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3136 return METAQUERY;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3137 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3138
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	3139 // 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	3140 // an identifier. Handles keywords. Return -1 if the identifier
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	3141 // should be ignored.
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 747 diff changeset	3142
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3143 static int
3974 e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	3144 handle_identifier (void)
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3145 {
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3146 bool at_bos = lexer_flags.at_beginning_of_statement;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3147
3974 e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	3148 std::string tok = strip_trailing_whitespace (yytext);
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	3149
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	3150 int c = yytext[yyleng-1];
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	3151
16106 031117f4db7c use enum for values returned by eat_continuation and eat_whitespace John W. Eaton <jwe@octave.org> parents: 16105 diff changeset	3152 bool cont_is_spc = (eat_continuation () != lexical_feedback::NO_WHITESPACE);
3974 e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	3153
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	3154 int spc_gobbled = (cont_is_spc \|\| c == ' ' \|\| c == '\t');
e2290bf911f0 [project @ 2002-07-04 17:38:22 by jwe] jwe parents: 3973 diff changeset	3155
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3156 // If we are expecting a structure element, avoid recognizing
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3157 // 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	3158 // 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	3159 // decide whether to insert a comma.
747 6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe] jwe parents: 661 diff changeset	3160
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	3161 if (lexer_flags.looking_at_indirect_ref)
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	3162 {
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3163 do_comma_insert_check ();
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3164
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	3165 maybe_unput_comma (spc_gobbled);
2819 ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe] jwe parents: 2804 diff changeset	3166
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3167 yylval.tok_val = new token (tok, lexer_flags.input_line_number,
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3168 lexer_flags.current_input_column);
2819 ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe] jwe parents: 2804 diff changeset	3169
ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe] jwe parents: 2804 diff changeset	3170 token_stack.push (yylval.tok_val);
ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe] jwe parents: 2804 diff changeset	3171
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	3172 lexer_flags.quote_is_transpose = true;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	3173 lexer_flags.convert_spaces_to_comma = true;
9324 29563379fa9b don't look for object index after keyword John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	3174 lexer_flags.looking_for_object_index = true;
2819 ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe] jwe parents: 2804 diff changeset	3175
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3176 lexer_flags.current_input_column += yyleng;
2819 ae3cce876a8e [project @ 1997-03-17 23:27:45 by jwe] jwe parents: 2804 diff changeset	3177
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2926 diff changeset	3178 return STRUCT_ELT;
1072 0cd3ba9c1f61 [project @ 1995-01-26 19:22:22 by jwe] jwe parents: 1060 diff changeset	3179 }
747 6182de8cb3b7 [project @ 1994-09-30 15:09:36 by jwe] jwe parents: 661 diff changeset	3180
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3181 lexer_flags.at_beginning_of_statement = false;
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3182
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3183 // The is_keyword_token may reset
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3184 // lexer_flags.at_beginning_of_statement. For example, if it sees
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3185 // 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	3186 // statement.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3187
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3188 int kw_token = is_keyword_token (tok);
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3189
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3190 // 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	3191 // 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	3192 // statement.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3193
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3194 if (lexer_flags.looking_at_function_handle)
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3195 {
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3196 if (kw_token)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3197 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3198 error ("function handles may not refer to keywords");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3199
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3200 return LEXICAL_ERROR;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3201 }
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3202 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3203 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3204 yylval.tok_val = new token (tok, lexer_flags.input_line_number,
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3205 lexer_flags.current_input_column);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3206
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3207 token_stack.push (yylval.tok_val);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3208
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3209 lexer_flags.current_input_column += yyleng;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3210 lexer_flags.quote_is_transpose = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3211 lexer_flags.convert_spaces_to_comma = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3212 lexer_flags.looking_for_object_index = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3213
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3214 return FCN_HANDLE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3215 }
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3216 }
bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	3217
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5088 diff changeset	3218 // 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	3219 // Keywords can be followed by identifiers.
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3220
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3221 if (kw_token)
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3222 {
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3223 if (kw_token >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3224 {
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3225 lexer_flags.current_input_column += yyleng;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3226 lexer_flags.quote_is_transpose = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3227 lexer_flags.convert_spaces_to_comma = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3228 lexer_flags.looking_for_object_index = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3229 }
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3230
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3231 return kw_token;
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3232 }
edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3233
1826 b14829582cc4 [project @ 1996-02-02 03:05:07 by jwe] jwe parents: 1823 diff changeset	3234 // 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	3235
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	3236 int c1 = text_yyinput ();
3480 45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3237
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3238 bool next_tok_is_eq = false;
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3239 if (c1 == '=')
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3240 {
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	3241 int c2 = text_yyinput ();
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	3242 xunput (c2, yytext);
3480 45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3243
45742a3b1f7c [project @ 2000-01-26 06:16:41 by jwe] jwe parents: 3428 diff changeset	3244 if (c2 != '=')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3245 next_tok_is_eq = true;
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
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	3248 xunput (c1, yytext);
1001 641c05eaed01 [project @ 1994-12-23 06:17:30 by jwe] jwe parents: 991 diff changeset	3249
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3250 // Kluge alert.
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3251 //
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3252 // 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	3253 // arguments.
76411ce43c05 [project @ 1997-02-26 07:52:14 by jwe] jwe parents: 2716 diff changeset	3254 //
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3255 // 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	3256 // 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	3257 // 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	3258 // as a variable in the current symbol table.
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3259
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3260 if (! is_variable (tok))
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3261 {
10052 5813ec5077b5 don't allow e, i, j, inf, or nan to be commands John W. Eaton <jwe@octave.org> parents: 10048 diff changeset	3262 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	3263 && looks_like_command_arg ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3264 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3265 BEGIN (COMMAND_START);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3266 }
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3267 else if (next_tok_is_eq
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3268 \|\| lexer_flags.looking_at_decl_list
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3269 \|\| lexer_flags.looking_at_return_list
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3270 \|\| (lexer_flags.looking_at_parameter_list
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3271 && ! lexer_flags.looking_at_initializer_expression))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3272 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3273 symbol_table::force_variable (tok);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3274 }
8001 ff9e7873f8ea improve handling of command-style names in matrix_or_assign_lhs context John W. Eaton <jwe@octave.org> parents: 7898 diff changeset	3275 else if (lexer_flags.looking_at_matrix_or_assign_lhs)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3276 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3277 lexer_flags.pending_local_variables.insert (tok);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3278 }
2702 7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3279 }
7a820bb7f406 [project @ 1997-02-19 19:22:34 by jwe] jwe parents: 2621 diff changeset	3280
4234 90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe] jwe parents: 4233 diff changeset	3281 // 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	3282 // transformation of the end keyword...
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe] jwe parents: 4233 diff changeset	3283
90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe] jwe parents: 4233 diff changeset	3284 if (tok == "end")
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	3285 tok = "__end__";
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3286
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3287 yylval.tok_val = new token (&(symbol_table::insert (tok)),
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3288 lexer_flags.input_line_number,
6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3289 lexer_flags.current_input_column);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3290
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3291 token_stack.push (yylval.tok_val);
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
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	3296 lexer_flags.convert_spaces_to_comma = true;
146 edfa5a96c5f1 [project @ 1993-10-05 04:02:15 by jwe] jwe parents: 143 diff changeset	3297
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3298 if (! (next_tok_is_eq \|\| YY_START == COMMAND_START))
2877 5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe] jwe parents: 2861 diff changeset	3299 {
5c1b9e545dd1 [project @ 1997-04-24 09:07:39 by jwe] jwe parents: 2861 diff changeset	3300 lexer_flags.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
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3307 lexer_flags.current_input_column += 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__")
29563379fa9b don't look for object index after keyword John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	3310 lexer_flags.looking_for_object_index = true;
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
4867 c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe] jwe parents: 4765 diff changeset	3315 bool
c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe] jwe parents: 4765 diff changeset	3316 is_keyword (const std::string& s)
c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe] jwe parents: 4765 diff changeset	3317 {
14292 d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3318 // Parsing function names like "set.property_name" inside
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3319 // classdef-style class definitions is simplified by handling the
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3320 // "set" and "get" portions of the names using the same mechanism as
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3321 // is used for keywords. However, they are not really keywords in
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3322 // the language, so omit them from the list of possible keywords.
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3323
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3324 return (octave_kw_hash::in_word_set (s.c_str (), s.length ()) != 0
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3325 && ! (s == "set" \|\| s == "get"));
4867 c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe] jwe parents: 4765 diff changeset	3326 }
c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe] jwe parents: 4765 diff changeset	3327
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3328 DEFUN (iskeyword, args, ,
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3329 "-- texinfo --\n\
11431 0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11367 diff changeset	3330 @deftypefn {Built-in Function} {} iskeyword ()\n\
0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11367 diff changeset	3331 @deftypefnx {Built-in Function} {} iskeyword (@var{name})\n\
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3332 Return true if @var{name} is an Octave keyword. If @var{name}\n\
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3333 is omitted, return a list of keywords.\n\
11431 0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11367 diff changeset	3334 @seealso{isvarname, exist}\n\
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3335 @end deftypefn")
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3336 {
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3337 octave_value retval;
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3338
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3339 int argc = args.length () + 1;
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3340
4867 c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe] jwe parents: 4765 diff changeset	3341 string_vector argv = args.make_argv ("iskeyword");
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3342
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3343 if (error_state)
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3344 return retval;
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3345
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3346 if (argc == 1)
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3347 {
14292 d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3348 // Neither set and get are keywords. See the note in the
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3349 // is_keyword function for additional details.
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3350
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3351 string_vector lst (TOTAL_KEYWORDS);
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3352
14292 d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3353 int j = 0;
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3354
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3355 for (int i = 0; i < TOTAL_KEYWORDS; i++)
14292 d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3356 {
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3357 std::string tmp = wordlist[i].name;
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3358
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3359 if (! (tmp == "set" \|\| tmp == "get"))
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3360 lst[j++] = tmp;
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3361 }
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3362
d1810b2ca809 iskeyword: don't consider get and set as keywords John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	3363 lst.resize (j);
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3364
8504 0e0bd07e6ae2 omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 8447 diff changeset	3365 retval = Cell (lst.sort ());
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3366 }
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3367 else if (argc == 2)
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3368 {
4867 c7f9ea142fda [project @ 2004-04-20 19:41:11 by jwe] jwe parents: 4765 diff changeset	3369 retval = is_keyword (argv[1]);
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3370 }
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3371 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	3372 print_usage ();
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3373
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3374 return retval;
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3375 }
4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3376
12801 2837514cf178 codesprint: Add tests for iskeyword() to lex.ll Rik <octave@nomad.inbox5.com> parents: 12627 diff changeset	3377 /*
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll Rik <octave@nomad.inbox5.com> parents: 12627 diff changeset	3378
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll Rik <octave@nomad.inbox5.com> parents: 12627 diff changeset	3379 %!assert (iskeyword ("for"))
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll Rik <octave@nomad.inbox5.com> parents: 12627 diff changeset	3380 %!assert (iskeyword ("fort"), false)
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll Rik <octave@nomad.inbox5.com> parents: 12627 diff changeset	3381 %!assert (iskeyword ("fft"), false)
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll Rik <octave@nomad.inbox5.com> parents: 12627 diff changeset	3382
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll Rik <octave@nomad.inbox5.com> parents: 12627 diff changeset	3383 */
2837514cf178 codesprint: Add tests for iskeyword() to lex.ll Rik <octave@nomad.inbox5.com> parents: 12627 diff changeset	3384
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	3385 void
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	3386 prep_lexer_for_script_file (void)
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	3387 {
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	3388 BEGIN (SCRIPT_FILE_BEGIN);
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7634 diff changeset	3389 }
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	3390
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	3391 void
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	3392 prep_lexer_for_function_file (void)
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	3393 {
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	3394 BEGIN (FUNCTION_FILE_BEGIN);
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	3395 }
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	3396
16098 24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3397 static int
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3398 octave_read (char *buf, unsigned max_size)
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3399 {
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3400 static const char * const eol = "\n";
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3401 static std::string input_buf;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3402 static const char *pos = 0;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3403 static size_t chars_left = 0;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3404 static bool eof = false;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3405
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3406 int status = 0;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3407
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3408 if (chars_left == 0)
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3409 {
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3410 pos = 0;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3411
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3412 input_buf = get_user_input (eof);
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3413
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3414 chars_left = input_buf.length ();
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3415
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3416 pos = input_buf.c_str ();
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3417 }
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3418
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3419 if (chars_left > 0)
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3420 {
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3421 size_t len = max_size > chars_left ? chars_left : max_size;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3422 assert (len > 0);
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3423
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3424 memcpy (buf, pos, len);
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3425
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3426 chars_left -= len;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3427 pos += len;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3428
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3429 // Make sure input ends with a new line character.
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3430 if (chars_left == 0 && buf[len-1] != '\n')
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3431 {
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3432 if (len < max_size)
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3433 {
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3434 // There is enough room to plug the newline character in
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3435 // the buffer.
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3436 buf[len++] = '\n';
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3437 }
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3438 else
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3439 {
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3440 // There isn't enough room to plug the newline character
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3441 // in the buffer so make sure it is returned on the next
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3442 // octave_read call.
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3443 pos = eol;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3444 chars_left = 1;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3445 }
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3446 }
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3447
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3448 status = len;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3449 }
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3450 else
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3451 {
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3452 status = YY_NULL;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3453
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3454 if (! eof)
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3455 YY_FATAL_ERROR ("octave_read () in flex scanner failed");
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3456 }
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3457
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3458 return status;
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3459 }
24b3800d30e7 move octave_read to lex.ll John W. Eaton <jwe@octave.org> parents: 15468 diff changeset	3460
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3461 static void
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3462 maybe_warn_separator_insert (char sep)
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3463 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	3464 std::string nm = curr_fcn_file_full_name;
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3465
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3466 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3467 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	3468 "potential auto-insertion of '%c' near line %d",
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3469 sep, lexer_flags.input_line_number);
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3470 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3471 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	3472 "potential auto-insertion of '%c' near line %d of file %s",
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3473 sep, lexer_flags.input_line_number, nm.c_str ());
3388 42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3474 }
42cb61dd0248 [project @ 1999-12-16 04:51:43 by jwe] jwe parents: 3351 diff changeset	3475
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3476 static void
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3477 gripe_single_quote_string (void)
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3478 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	3479 std::string nm = curr_fcn_file_full_name;
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3480
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3481 if (nm.empty ())
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3482 warning_with_id ("Octave:single-quote-string",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3483 "single quote delimited string near line %d",
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3484 lexer_flags.input_line_number);
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3485 else
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5783 diff changeset	3486 warning_with_id ("Octave:single-quote-string",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3487 "single quote delimited string near line %d of file %s",
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3488 lexer_flags.input_line_number, nm.c_str ());
3400 18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3489 }
18366d37e7dd [project @ 1999-12-22 23:36:09 by jwe] jwe parents: 3388 diff changeset	3490
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3491 static void
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3492 gripe_matlab_incompatible (const std::string& msg)
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3493 {
8974 fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3494 std::string nm = curr_fcn_file_full_name;
fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3495
fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3496 if (nm.empty ())
fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3497 warning_with_id ("Octave:matlab-incompatible",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3498 "potential Matlab compatibility problem: %s",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3499 msg.c_str ());
8974 fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3500 else
fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	3501 warning_with_id ("Octave:matlab-incompatible",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3502 "potential Matlab compatibility problem: %s near line %d offile %s",
16103 6434f70f0ee0 move input_line_number and current_input_column to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16102 diff changeset	3503 msg.c_str (), lexer_flags.input_line_number, nm.c_str ());
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3504 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3505
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3506 static void
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3507 maybe_gripe_matlab_incompatible_comment (char c)
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3508 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3509 if (c == '#')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3510 gripe_matlab_incompatible ("# used as comment character");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3511 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3512
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3513 static void
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3514 gripe_matlab_incompatible_continuation (void)
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3515 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3516 gripe_matlab_incompatible ("\\ used as line continuation marker");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3517 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3518
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3519 static void
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3520 gripe_matlab_incompatible_operator (const std::string& op)
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3521 {
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3522 std::string t = op;
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3523 int n = t.length ();
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3524 if (t[n-1] == '\n')
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3525 t.resize (n-1);
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3526 gripe_matlab_incompatible (t + " used as operator");
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3527 }
7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	3528
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3529 static void
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3530 display_token (int tok)
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3531 {
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3532 switch (tok)
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3533 {
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3534 case '=': std::cerr << "'='\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3535 case ':': std::cerr << "':'\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3536 case '-': std::cerr << "'-'\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3537 case '+': std::cerr << "'+'\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3538 case '': std::cerr << "''\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3539 case '/': std::cerr << "'/'\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3540 case ADD_EQ: std::cerr << "ADD_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3541 case SUB_EQ: std::cerr << "SUB_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3542 case MUL_EQ: std::cerr << "MUL_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3543 case DIV_EQ: std::cerr << "DIV_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3544 case LEFTDIV_EQ: std::cerr << "LEFTDIV_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3545 case POW_EQ: std::cerr << "POW_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3546 case EMUL_EQ: std::cerr << "EMUL_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3547 case EDIV_EQ: std::cerr << "EDIV_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3548 case ELEFTDIV_EQ: std::cerr << "ELEFTDIV_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3549 case EPOW_EQ: std::cerr << "EPOW_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3550 case AND_EQ: std::cerr << "AND_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3551 case OR_EQ: std::cerr << "OR_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3552 case LSHIFT_EQ: std::cerr << "LSHIFT_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3553 case RSHIFT_EQ: std::cerr << "RSHIFT_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3554 case LSHIFT: std::cerr << "LSHIFT\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3555 case RSHIFT: std::cerr << "RSHIFT\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3556 case EXPR_AND_AND: std::cerr << "EXPR_AND_AND\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3557 case EXPR_OR_OR: std::cerr << "EXPR_OR_OR\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3558 case EXPR_AND: std::cerr << "EXPR_AND\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3559 case EXPR_OR: std::cerr << "EXPR_OR\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3560 case EXPR_NOT: std::cerr << "EXPR_NOT\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3561 case EXPR_LT: std::cerr << "EXPR_LT\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3562 case EXPR_LE: std::cerr << "EXPR_LE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3563 case EXPR_EQ: std::cerr << "EXPR_EQ\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3564 case EXPR_NE: std::cerr << "EXPR_NE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3565 case EXPR_GE: std::cerr << "EXPR_GE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3566 case EXPR_GT: std::cerr << "EXPR_GT\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3567 case LEFTDIV: std::cerr << "LEFTDIV\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3568 case EMUL: std::cerr << "EMUL\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3569 case EDIV: std::cerr << "EDIV\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3570 case ELEFTDIV: std::cerr << "ELEFTDIV\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3571 case EPLUS: std::cerr << "EPLUS\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3572 case EMINUS: std::cerr << "EMINUS\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3573 case QUOTE: std::cerr << "QUOTE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3574 case TRANSPOSE: std::cerr << "TRANSPOSE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3575 case PLUS_PLUS: std::cerr << "PLUS_PLUS\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3576 case MINUS_MINUS: std::cerr << "MINUS_MINUS\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3577 case POW: std::cerr << "POW\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3578 case EPOW: std::cerr << "EPOW\n"; break;
11466 1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3579
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3580 case NUM:
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3581 case IMAG_NUM:
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3582 std::cerr << (tok == NUM ? "NUM" : "IMAG_NUM")
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3583 << " [" << yylval.tok_val->number () << "]\n";
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3584 break;
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3585
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3586 case STRUCT_ELT:
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3587 std::cerr << "STRUCT_ELT [" << yylval.tok_val->text () << "]\n"; break;
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3588
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3589 case NAME:
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3590 {
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3591 symbol_table::symbol_record *sr = yylval.tok_val->sym_rec ();
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3592 std::cerr << "NAME";
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3593 if (sr)
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3594 std::cerr << " [" << sr->name () << "]";
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3595 std::cerr << "\n";
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3596 }
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3597 break;
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3598
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3599 case END: std::cerr << "END\n"; break;
11466 1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3600
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3601 case DQ_STRING:
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3602 case SQ_STRING:
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3603 std::cerr << (tok == DQ_STRING ? "DQ_STRING" : "SQ_STRING")
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3604 << " [" << yylval.tok_val->text () << "]\n";
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3605 break;
1f64a7b73e98 lex.ll (display_tokens): print token values John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	3606
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3607 case FOR: std::cerr << "FOR\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3608 case WHILE: std::cerr << "WHILE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3609 case DO: std::cerr << "DO\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3610 case UNTIL: std::cerr << "UNTIL\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3611 case IF: std::cerr << "IF\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3612 case ELSEIF: std::cerr << "ELSEIF\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3613 case ELSE: std::cerr << "ELSE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3614 case SWITCH: std::cerr << "SWITCH\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3615 case CASE: std::cerr << "CASE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3616 case OTHERWISE: std::cerr << "OTHERWISE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3617 case BREAK: std::cerr << "BREAK\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3618 case CONTINUE: std::cerr << "CONTINUE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3619 case FUNC_RET: std::cerr << "FUNC_RET\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3620 case UNWIND: std::cerr << "UNWIND\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3621 case CLEANUP: std::cerr << "CLEANUP\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3622 case TRY: std::cerr << "TRY\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3623 case CATCH: std::cerr << "CATCH\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3624 case GLOBAL: std::cerr << "GLOBAL\n"; break;
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14292 diff changeset	3625 case PERSISTENT: std::cerr << "PERSISTENT\n"; break;
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3626 case FCN_HANDLE: std::cerr << "FCN_HANDLE\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3627 case END_OF_INPUT: std::cerr << "END_OF_INPUT\n\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3628 case LEXICAL_ERROR: std::cerr << "LEXICAL_ERROR\n\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3629 case FCN: std::cerr << "FCN\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3630 case CLOSE_BRACE: std::cerr << "CLOSE_BRACE\n"; break;
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	3631 case SCRIPT_FILE: std::cerr << "SCRIPT_FILE\n"; break;
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	3632 case FUNCTION_FILE: std::cerr << "FUNCTION_FILE\n"; break;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3633 case SUPERCLASSREF: std::cerr << "SUPERCLASSREF\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3634 case METAQUERY: std::cerr << "METAQUERY\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3635 case GET: std::cerr << "GET\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3636 case SET: std::cerr << "SET\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3637 case PROPERTIES: std::cerr << "PROPERTIES\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3638 case METHODS: std::cerr << "METHODS\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3639 case EVENTS: std::cerr << "EVENTS\n"; break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	3640 case CLASSDEF: std::cerr << "CLASSDEF\n"; break;
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3641 case '\n': std::cerr << "\\n\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3642 case '\r': std::cerr << "\\r\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3643 case '\t': std::cerr << "TAB\n"; break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3644 default:
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3645 {
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3646 if (tok < 256)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3647 std::cerr << static_cast<char> (tok) << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3648 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3649 std::cerr << "UNKNOWN(" << tok << ")\n";
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3650 }
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3651 break;
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3652 }
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3653 }
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3654
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3655 static void
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3656 display_state (void)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3657 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3658 std::cerr << "S: ";
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3659
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3660 switch (YY_START)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3661 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3662 case INITIAL:
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3663 std::cerr << "INITIAL" << std::endl;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3664 break;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3665
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3666 case COMMAND_START:
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3667 std::cerr << "COMMAND_START" << std::endl;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3668 break;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3669
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3670 case MATRIX_START:
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3671 std::cerr << "MATRIX_START" << std::endl;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3672 break;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3673
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3674 case SCRIPT_FILE_BEGIN:
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3675 std::cerr << "SCRIPT_FILE_BEGIN" << std::endl;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3676 break;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3677
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	3678 case FUNCTION_FILE_BEGIN:
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	3679 std::cerr << "FUNCTION_FILE_BEGIN" << std::endl;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3680 break;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3681
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3682 default:
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3683 std::cerr << "UNKNOWN START STATE!" << std::endl;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3684 break;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3685 }
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3686 }
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3687
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3688 static void
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3689 lexer_debug (const char pattern, const char text)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3690 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3691 std::cerr << std::endl;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3692
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3693 display_state ();
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3694
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3695 std::cerr << "P: " << pattern << std::endl;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3696 std::cerr << "T: " << text << std::endl;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3697 }
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3698
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3699 DEFUN (__display_tokens__, args, nargout,
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3700 "-- texinfo --\n\
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8767 diff changeset	3701 @deftypefn {Built-in Function} {} __display_tokens__ ()\n\
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3702 Query or set the internal variable that determines whether Octave's\n\
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3703 lexer displays tokens as they are read.\n\
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3704 @end deftypefn")
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3705 {
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3706 return SET_INTERNAL_VARIABLE (display_tokens);
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3707 }
c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	3708
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	3709 DEFUN (__token_count__, , ,
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	3710 "-- texinfo --\n\
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8767 diff changeset	3711 @deftypefn {Built-in Function} {} __token_count__ ()\n\
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	3712 Number of language tokens processed since Octave startup.\n\
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	3713 @end deftypefn")
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	3714 {
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	3715 return octave_value (Vtoken_count);
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	3716 }
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	3717
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3718 DEFUN (__lexer_debug_flag__, args, nargout,
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8767 diff changeset	3719 "-- texinfo --\n\
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8767 diff changeset	3720 @deftypefn {Built-in Function} {@var{old_val} =} __lexer_debug_flag__ (@var{new_val}))\n\
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8767 diff changeset	3721 Undocumented internal function.\n\
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8767 diff changeset	3722 @end deftypefn")
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3723 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3724 octave_value retval;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3725
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3726 retval = set_internal_variable (lexer_debug_flag, args, nargout,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	3727 "__lexer_debug_flag__");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3728
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3729 return retval;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	3730 }

Mercurial > hg > octave-lyh

annotate libinterp/parse-tree/lex.ll @ 16106:031117f4db7c