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

annotate libinterp/parse-tree/lex.ll @ 23730:85f1d31956c0

make echo work for command-line functions * file-info.h (file_info::file_info): New constructor from program text and time when text was processed. * ov-usr-fcn.h, ov-usr-fcn.cc (octave_user_code::get_file_info): New function. (octave_user_code::get_code_line, octave_user_code::get_code_lines): Use get_file_info to update m_file_info if it is not already defined. (octave_user_code::cache_function_text): New function. * lex.h, lex.ll (base_lexer::lexical_feedback::buffer_function_text, base_lexer::lexical_feedback::function_text): New variables. (base_lexer::is_keyword_token, lexer::fill_flex_buffer): Handle buffering of function text command-line functions. * oct-parse.in.yy (base_parser::finish_function): Cache function text for command-line functions.

author	John W. Eaton <jwe@octave.org>
date	Wed, 05 Jul 2017 15:24:55 -0400
parents	08036a7f3660
children	ea879bc55272

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
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23211 diff changeset	3 Copyright (C) 1993-2017 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
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	8 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	9 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	10 (at your option) any later version.
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	11
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22505 diff changeset	15 GNU General Public License for more details.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	16
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6547 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6547 diff changeset	19 <http://www.gnu.org/licenses/>.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	20
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	21 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	22
16150 891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	23 /*
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	24 We are using the pure parser interface and the reentrant lexer
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	25 interface but the Octave parser and lexer are NOT properly
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	26 reentrant because both still use many global variables. It should be
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	27 safe to create a parser object and call it while another parser
16150 891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	28 object is active (to parse a callback function while the main
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	29 interactive parser is waiting for input, for example) if you take
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	30 care to properly save and restore (typically with an unwind_protect
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	31 object) relevant global values before and after the nested call.
891a2a4df71f * lex.ll: Use C-style comments in preamble. John W. Eaton <jwe@octave.org> parents: 16149 diff changeset	32 */
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	33
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	34 %top {
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	35 #if defined (HAVE_CONFIG_H)
22003 2d3972b802ff use consistent style for including config.h in source files John W. Eaton <jwe@octave.org> parents: 21987 diff changeset	36 # include "config.h"
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	37 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	38
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	39 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	40 // This one needs to be global.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	41 #pragma GCC diagnostic ignored "-Wunused-function"
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	42
21987 f31f30a9348f disable -Wsign-compare for code generated by flex John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	43 // Disable these warnings for code that is generated by flex, including
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	44 // pattern rules. Push the current state so we can restore the warning
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	45 // state prior to functions we define at the bottom of the file.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	46 #pragma GCC diagnostic push
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	47 #pragma GCC diagnostic ignored "-Wold-style-cast"
21987 f31f30a9348f disable -Wsign-compare for code generated by flex John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	48 #pragma GCC diagnostic ignored "-Wsign-compare"
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	49 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	50
21332 db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	51 // Define away the deprecated register storage class specifier to avoid
db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	52 // potential warnings about it.
db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	53 #if ! defined (register)
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	54 # define register
21332 db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	55 #endif
db574711df78 eliminate deprecated register storage class specifier John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	56
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	57 }
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	58
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	59 %option prefix = "octave_"
16146 b6050fc0a2d9 use %option noyywrap John W. Eaton <jwe@octave.org> parents: 16139 diff changeset	60 %option noyywrap
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	61 %option reentrant
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	62 %option bison-bridge
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	63
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	64 %option noyyalloc
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	65 %option noyyrealloc
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	66 %option noyyfree
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	67
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	68 %x COMMAND_START
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	69 %s MATRIX_START
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	70
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	71 %x INPUT_FILE_START
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	72
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	73 %x BLOCK_COMMENT_START
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	74 %x LINE_COMMENT_START
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	75
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	76 %x DQ_STRING_START
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	77 %x SQ_STRING_START
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	78
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	79 %x FQ_IDENT_START
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	80
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	81 %{
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 216 diff changeset	82
1341 e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	83 #include <cctype>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	84 #include <cstring>
e4e4131b1648 [project @ 1995-09-04 00:13:33 by jwe] jwe parents: 1315 diff changeset	85
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	86 #include <iostream>
8001 ff9e7873f8ea improve handling of command-style names in matrix_or_assign_lhs context John W. Eaton <jwe@octave.org> parents: 7898 diff changeset	87 #include <set>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5615 diff changeset	88 #include <sstream>
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	89 #include <string>
4214 b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe] jwe parents: 4208 diff changeset	90 #include <stack>
1823 5cdd59e7579a [project @ 1996-02-01 12:45:05 by jwe] jwe parents: 1755 diff changeset	91
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2900 diff changeset	92 #include "cmd-edit.h"
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21814 diff changeset	93 #include "lo-mappers.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4131 diff changeset	94 #include "quit.h"
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21814 diff changeset	95 #include "unistd-wrappers.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2900 diff changeset	96
16154 aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment. John W. Eaton <jwe@octave.org> parents: 16150 diff changeset	97 // These would be alphabetical, but oct-parse.h must be included before
aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment. John W. Eaton <jwe@octave.org> parents: 16150 diff changeset	98 // oct-gperf.h and oct-parse.h must be included after token.h and the tree
aa5e1e8dce66 * lex.ll: Change y.tab.h to oct-parse.h in comment. John W. Eaton <jwe@octave.org> parents: 16150 diff changeset	99 // class declarations. We can't include oct-parse.h in oct-gperf.h
1497 48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	100 // 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	101 // times.
48a0b289f1be [project @ 1995-09-30 22:04:27 by jwe] jwe parents: 1489 diff changeset	102
4264 4e2d2516da22 [project @ 2003-01-03 05:30:34 by jwe] jwe parents: 4248 diff changeset	103 #include "Cell.h"
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3598 diff changeset	104 #include "comment-list.h"
2181 138b3c98dc85 [project @ 1996-05-13 18:02:31 by jwe] jwe parents: 2167 diff changeset	105 #include "defun.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	106 #include "error.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21074 diff changeset	107 #include "errwarn.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1341 diff changeset	108 #include "input.h"
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	109 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22089 diff changeset	110 #include "interpreter.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	111 #include "lex.h"
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22003 diff changeset	112 #include "octave.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	113 #include "ov.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	114 #include "parse.h"
2987 ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe] jwe parents: 2982 diff changeset	115 #include "pt-all.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	116 #include "symtab.h"
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2877 diff changeset	117 #include "token.h"
1355 94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	118 #include "utils.h"
94697d007075 [project @ 1995-09-05 20:04:15 by jwe] jwe parents: 1351 diff changeset	119 #include "variables.h"
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	120 #include "oct-parse.h"
06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	121 #include "oct-gperf.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	122
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	123 // FIXME: with bison 3.x, OCTAVE_STYPE appears in the generated
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	124 // oct-parse.h file, but there is no definition for YYSTYPE, which is
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	125 // needed by the code that is generated by flex. I can't seem to find a
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	126 // way to tell flex to use OCTAVE_STYPE instead of YYSTYPE in the code
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	127 // it generates, or to tell bison to provide the definition of YYSTYPE
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	128 // in the generated oct-parse.h file.
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	129
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	130 #if defined (OCTAVE_STYPE_IS_DECLARED) && ! defined YYSTYPE
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	131 # define YYSTYPE OCTAVE_STYPE
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	132 #endif
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18774 diff changeset	133
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21814 diff changeset	134 #define YY_NO_UNISTD_H 1
4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21814 diff changeset	135 #define isatty octave_isatty_wrapper
4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21814 diff changeset	136
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	137 #if ! (defined (FLEX_SCANNER) \
2716 2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	138 && 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	139 && 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	140 #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	141 #endif
2b5c27299cde [project @ 1997-02-22 08:40:55 by jwe] jwe parents: 2702 diff changeset	142
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	143 #define YY_EXTRA_TYPE octave::base_lexer *
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16148 diff changeset	144 #define curr_lexer yyextra
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	145
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	146 // Arrange to get input via readline.
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	147
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	148 #if defined (YY_INPUT)
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	149 # undef YY_INPUT
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	150 #endif
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	151 #define YY_INPUT(buf, result, max_size) \
16293 57e87ddfee14 create base class for lexer John W. Eaton <jwe@octave.org> parents: 16292 diff changeset	152 result = curr_lexer->fill_flex_buffer (buf, max_size)
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	153
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	154 // 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	155
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	156 #if defined (YY_FATAL_ERROR)
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21722 diff changeset	157 # undef YY_FATAL_ERROR
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4678 diff changeset	158 #endif
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	159 #define YY_FATAL_ERROR(msg) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	160 (yyget_extra (yyscanner))->fatal_error (msg)
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	161
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	162 #define CMD_OR_OP(PATTERN, TOK, COMPAT) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	163 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	164 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	165 curr_lexer->lexer_debug (PATTERN); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	166 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	167 if (curr_lexer->looks_like_command_arg ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	168 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	169 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	170 curr_lexer->push_start_state (COMMAND_START); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	171 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	172 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	173 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	174 return curr_lexer->handle_op_internal (TOK, false, COMPAT); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	175 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	176 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	177 while (0)
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	178
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	179 #define CMD_OR_COMPUTED_ASSIGN_OP(PATTERN, TOK) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	180 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	181 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	182 curr_lexer->lexer_debug (PATTERN); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	183 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	184 if (curr_lexer->previous_token_may_be_command () \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	185 && curr_lexer->space_follows_previous_token ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	186 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	187 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	188 curr_lexer->push_start_state (COMMAND_START); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	189 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	190 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	191 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	192 return curr_lexer->handle_language_extension_op (PATTERN, TOK, \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	193 false); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	194 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	195 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	196 while (0)
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	197
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	198 #define CMD_OR_UNARY_OP(PATTERN, TOK, COMPAT) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	199 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	200 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	201 curr_lexer->lexer_debug (PATTERN); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	202 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	203 if (curr_lexer->previous_token_may_be_command ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	204 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	205 if (curr_lexer->looks_like_command_arg ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	206 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	207 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	208 curr_lexer->push_start_state (COMMAND_START); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	209 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	210 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	211 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	212 return curr_lexer->handle_op_internal (TOK, false, COMPAT); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	213 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	214 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	215 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	216 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	217 int tok \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	218 = (COMPAT \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	219 ? curr_lexer->handle_unary_op (TOK) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	220 : curr_lexer->handle_language_extension_unary_op (TOK)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	221 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	222 if (tok < 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	223 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	224 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	225 curr_lexer->xunput (','); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	226 /* Adjust for comma that was not really in the input stream. */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	227 curr_lexer->current_input_column--; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	228 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	229 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	230 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	231 return tok; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	232 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	233 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	234 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	235 while (0)
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	236
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	237 // We can't rely on the trick used elsewhere of sticking ASCII 1 in
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	238 // the input buffer and recognizing it as a special case because ASCII
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	239 // 1 is a valid character for a character string. If we are at the
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	240 // end of the buffer, ask for more input. If we are at the end of the
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	241 // file, deal with it. Otherwise, just keep going with the text from
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	242 // the current buffer.
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	243 #define HANDLE_STRING_CONTINUATION \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	244 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	245 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	246 curr_lexer->decrement_promptflag (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	247 curr_lexer->input_line_number++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	248 curr_lexer->current_input_column = 1; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	249 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	250 if (curr_lexer->is_push_lexer ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	251 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	252 if (curr_lexer->at_end_of_buffer ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	253 return -1; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	254 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	255 if (curr_lexer->at_end_of_file ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	256 return curr_lexer->handle_end_of_input (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	257 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	258 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	259 while (0)
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	260
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	261 // When a command argument boundary is detected, push out the
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	262 // current argument being built. This one seems like a good
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	263 // candidate for a function call.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	264
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	265 #define COMMAND_ARG_FINISH \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	266 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	267 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	268 if (curr_lexer->string_text.empty ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	269 break; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	270 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	271 int retval = curr_lexer->handle_token (curr_lexer->string_text, \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	272 SQ_STRING); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	273 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	274 curr_lexer->string_text = ""; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	275 curr_lexer->command_arg_paren_count = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	276 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	277 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	278 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	279 return retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	280 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	281 while (0)
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	282
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	283 #define HANDLE_IDENTIFIER(pattern, get_set) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	284 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	285 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	286 curr_lexer->lexer_debug (pattern); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	287 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	288 int tok = curr_lexer->previous_token_value (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	289 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	290 if (curr_lexer->whitespace_is_significant () \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	291 && curr_lexer->space_follows_previous_token () \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	292 && ! (tok == '[' \|\| tok == '{' \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	293 \|\| curr_lexer->previous_token_is_binop ())) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	294 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	295 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	296 unput (','); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	297 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	298 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	299 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	300 if (! curr_lexer->looking_at_decl_list \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	301 && curr_lexer->previous_token_may_be_command ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	302 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	303 yyless (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	304 curr_lexer->push_start_state (COMMAND_START); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	305 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	306 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	307 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	308 if (get_set) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	309 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	310 yyless (3); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	311 curr_lexer->maybe_classdef_get_set_method = false; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	312 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	313 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	314 int id_tok = curr_lexer->handle_identifier (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	315 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	316 if (id_tok >= 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	317 return curr_lexer->count_token_internal (id_tok); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	318 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	319 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	320 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	321 while (0)
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	322
7722 c3bb0b7a4261 lex.l: allow tokens to be displayed when parsed John W. Eaton <jwe@octave.org> parents: 7720 diff changeset	323 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	324
4910 1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	325 static unsigned int Vtoken_count = 0;
1242acab4246 [project @ 2004-07-12 17:14:13 by jwe] jwe parents: 4867 diff changeset	326
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	327 // Internal variable for lexer debugging state.
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	328 static bool lexer_debug_flag = false;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	329
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	330 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	331
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	332 D [0-9]
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	333 D_ [0-9_]
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	334 S [ \t]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	335 NL ((\n)\|(\r)\|(\r\n))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	336 Im [iIjJ]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	337 CCHAR [#%]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	338 IDENT ([_$a-zA-Z][_$a-zA-Z0-9]*)
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	339 FQIDENT ({IDENT}(\.{IDENT})*)
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	340 EXPON ([DdEe][+-]?{D}{D_}*)
20589 7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	341 NUMBIN (0[bB][01_]+)
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	342 NUMHEX (0[xX][0-9a-fA-F][0-9a-fA-F_]*)
20589 7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	343 NUMREAL (({D}{D_}\.?{D_}{EXPON}?)\|(\.{D}{D_}*{EXPON}?))
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	344 NUMBER ({NUMREAL}\|{NUMHEX}\|{NUMBIN})
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	345
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	346 ANY_EXCEPT_NL [^\r\n]
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	347 ANY_INCLUDING_NL (.\|{NL})
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	348
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	349 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	350
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	351 %{
20835 14cd86258b3d use 'invalid' instead of 'bogus' in source files John W. Eaton <jwe@octave.org> parents: 20812 diff changeset	352 // Make script and function files start with an invalid token. This makes
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	353 // the parser go down a special path.
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	354 %}
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9324 diff changeset	355
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	356 <INPUT_FILE_START>{ANY_INCLUDING_NL} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	357 curr_lexer->lexer_debug ("<INPUT_FILE_START>{ANY_INCLUDING_NL}");
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	358
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	359 curr_lexer->xunput (yytext[0]);
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	360
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	361 // May be reset later if we see "function" or "classdef" appears
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	362 // as the first token.
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	363 curr_lexer->reading_script_file = true;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	364
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	365 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	366
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	367 return curr_lexer->show_token (INPUT_FILE);
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	368 }
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	369
18774 4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	370 <INPUT_FILE_START><<EOF>> {
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	371 curr_lexer->lexer_debug ("<INPUT_FILE_START><<EOF>>");
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	372
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	373 // May be reset later if we see "function" or "classdef" appears
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	374 // as the first token.
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	375 curr_lexer->reading_script_file = true;
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	376
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	377 curr_lexer->pop_start_state ();
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	378
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	379 return curr_lexer->show_token (INPUT_FILE);
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	380 }
4293f49795d9 don't crash on empty script files (bug #42064) John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	381
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	382 %{
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	383 // Help and other command-style functions.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	384 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	385
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	386 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	387 // Commands can be continued on a second line using the ellipsis.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	388 // If an argument is in construction, it is completed.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	389 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	390
18312 7ac2a8b758fc maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18247 18311 diff changeset	391 <COMMAND_START>(\.\.\.){ANY_EXCEPT_NL}*{NL} {
7ac2a8b758fc maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18247 18311 diff changeset	392 curr_lexer->lexer_debug ("<COMMAND_START>(\\.\\.\\.){ANY_EXCEPT_NL}*{NL}");
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	393
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	394 COMMAND_ARG_FINISH;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	395
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	396 curr_lexer->input_line_number++;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	397 curr_lexer->current_input_column = 1;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	398
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	399 HANDLE_STRING_CONTINUATION;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	400 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	401
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	402 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	403 // Commands normally end at the end of a line or a semicolon.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	404 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	405
18312 7ac2a8b758fc maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18247 18311 diff changeset	406 <COMMAND_START>({CCHAR}{ANY_EXCEPT_NL}*)?{NL} {
7ac2a8b758fc maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18247 18311 diff changeset	407 curr_lexer->lexer_debug ("<COMMAND_START>({CCHAR}{ANY_EXCEPT_NL}*)?{NL}");
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	408
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	409 COMMAND_ARG_FINISH;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	410
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	411 curr_lexer->input_line_number++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	412 curr_lexer->current_input_column = 1;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	413 curr_lexer->looking_for_object_index = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	414 curr_lexer->at_beginning_of_statement = true;
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	415 curr_lexer->pop_start_state ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	416
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	417 return curr_lexer->handle_token ('\n');
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	418 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	419
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	420 <COMMAND_START>[\,\;] {
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	421 curr_lexer->lexer_debug ("<COMMAND_START>[\\,\\;]");
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	422
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	423 if (yytext[0] != ',' \|\| curr_lexer->command_arg_paren_count == 0)
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	424 {
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	425 COMMAND_ARG_FINISH;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	426 curr_lexer->looking_for_object_index = false;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	427 curr_lexer->at_beginning_of_statement = true;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	428 curr_lexer->pop_start_state ();
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	429 return curr_lexer->handle_token (yytext[0]);
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	430 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	431 else
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	432 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	433
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	434 curr_lexer->current_input_column += yyleng;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	435 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	436
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	437 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	438 // Unbalanced parentheses serve as pseudo-quotes: they are included in
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	439 // the final argument string, but they cause parentheses and quotes to
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	440 // be slurped into that argument as well.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	441 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	442
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	443 <COMMAND_START>[\(\[\{]* {
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	444 curr_lexer->lexer_debug ("<COMMAND_START>[\\(\\[\\{]+");
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	445
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	446 curr_lexer->command_arg_paren_count += yyleng;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	447 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	448 curr_lexer->current_input_column += yyleng;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	449 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	450
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	451 <COMMAND_START>[\)\]\}]* {
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	452 curr_lexer->lexer_debug ("<COMMAND_START>[\\)\\]\\}]+");
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	453
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	454 curr_lexer->command_arg_paren_count -= yyleng;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	455 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	456 curr_lexer->current_input_column += yyleng;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	457 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	458
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	459 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	460 // Handle quoted strings. Quoted strings that are not separated by
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	461 // whitespace from other argument text are combined with that previous
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	462 // text. For instance,
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	463 //
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	464 // command 'text1'"text2"
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	465 //
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	466 // has a single argument text1text2, not two separate arguments.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	467 // That's why we must test to see if we are in command argument mode
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	468 // when processing the end of a string.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	469 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	470
4208 e96f52432059 [project @ 2002-12-03 19:48:57 by jwe] jwe parents: 4198 diff changeset	471 <COMMAND_START>[\"\'] {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	472 curr_lexer->lexer_debug ("<COMMAND_START>[\\\"\\']");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	473
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	474 if (curr_lexer->command_arg_paren_count == 0)
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	475 curr_lexer->begin_string (yytext[0] == '"'
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	476 ? DQ_STRING_START : SQ_STRING_START);
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	477 else
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	478 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	479
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	480 curr_lexer->current_input_column += yyleng;
975 e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	481 }
e7165acbf96f [project @ 1994-12-12 20:30:19 by jwe] jwe parents: 973 diff changeset	482
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	483 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	484 // In standard command argument processing, whitespace separates
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	485 // arguments. In the presence of unbalanced parentheses, it is
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	486 // incorporated into the argument.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	487 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	488
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	489 <COMMAND_START>{S}* {
af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	490 curr_lexer->lexer_debug ("<COMMAND_START>{S}*");
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	491
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	492 if (curr_lexer->command_arg_paren_count == 0)
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	493 COMMAND_ARG_FINISH;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	494 else
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	495 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	496
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	497 curr_lexer->current_input_column += yyleng;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	498 }
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	499
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	500 %{
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	501 // Everything else is slurped into the command arguments.
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	502 %}
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	503
18234 af8a70d6885c improve command parsing Michael C. Grant <mcg@cvxr.com> parents: 18231 diff changeset	504 <COMMAND_START>([\.]\|[^#% \t\r\n\.\,\;\"\'$\[\{\}\]$]*) {
18458 ebb878596bcf Restore escaped backslashes accidentally deleted by cset af8a70d6885c Mike Miller <mtmiller@ieee.org> parents: 18437 diff changeset	505 curr_lexer->lexer_debug ("<COMMAND_START>([\\.]\|[^#% \\t\\r\\n\\.\\,\\;\\\"\\'\$\\[\\{\\}\\]\$]*");
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	506
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	507 curr_lexer->string_text += yytext;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	508 curr_lexer->current_input_column += yyleng;
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	509 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	510
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	511 <MATRIX_START>{S}* {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	512 curr_lexer->lexer_debug ("<MATRIX_START>{S}*");
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	513
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	514 curr_lexer->mark_previous_token_trailing_space ();
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	515 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	516
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	517 <MATRIX_START>{NL} {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	518 curr_lexer->lexer_debug ("<MATRIX_START>{NL}");
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	519
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	520 curr_lexer->input_line_number++;
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	521 curr_lexer->current_input_column = 1;
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	522
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	523 if (curr_lexer->nesting_level.is_paren ())
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	524 curr_lexer->warn_language_extension ("bare newline inside parentheses");
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	525 else
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	526 {
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	527 int tok = curr_lexer->previous_token_value ();
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	528
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	529 if (! (tok == ';' \|\| tok == '[' \|\| tok == '{'))
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	530 {
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	531 curr_lexer->xunput (';');
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	532 // Adjust for semicolon that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	533 curr_lexer->current_input_column--;
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	534 }
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	535 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	536 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	537
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	538 %{
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	539 // 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	540 // need to know if the next token is '=' or '=='.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	541 //
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	542 // 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	543 // 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	544 // operator.
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	545 //
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	546 // 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	547 // after seeing a ']' character...
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	548
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17744 diff changeset	549 // FIXME: we need to handle block comments here.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	550 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	551
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	552 <MATRIX_START>\] {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	553 curr_lexer->lexer_debug ("<MATRIX_START>\\]");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	554
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	555 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	556
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	557 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	558 curr_lexer->at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	559
16299 c40a8873c2e7 eliminate some unused variables John W. Eaton <jwe@octave.org> parents: 16294 diff changeset	560 curr_lexer->handle_close_bracket (']');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	561
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	562 return curr_lexer->count_token (']');
4608 22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	563 }
22ca4cc02525 [project @ 2003-11-14 03:55:04 by jwe] jwe parents: 4476 diff changeset	564
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	565 %{
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17744 diff changeset	566 // FIXME: we need to handle block comments here.
7723 74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	567 %}
74f5e0c7de9e first pass at handling block comments John W. Eaton <jwe@octave.org> parents: 7722 diff changeset	568
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	569 <MATRIX_START>\} {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	570 curr_lexer->lexer_debug ("<MATRIX_START>\\}*");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	571
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	572 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	573
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	574 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	575 curr_lexer->at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	576
16299 c40a8873c2e7 eliminate some unused variables John W. Eaton <jwe@octave.org> parents: 16294 diff changeset	577 curr_lexer->handle_close_bracket ('}');
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	578
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	579 return curr_lexer->count_token ('}');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	580 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	581
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	582 \[ {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	583 curr_lexer->lexer_debug ("\\[");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	584
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	585 bool unput_comma = false;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	586
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	587 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	588 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	589 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	590 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	591
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	592 if (! (tok == '[' \|\| tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	593 \|\| curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	594 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	595 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	596
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	597 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	598 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	599 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	600 curr_lexer->xunput (',');
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	601 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	602 curr_lexer->current_input_column--;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	603 }
5615 d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe] jwe parents: 5570 diff changeset	604 else
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	605 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	606 curr_lexer->nesting_level.bracket ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	607
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	608 curr_lexer->looking_at_object_index.push_front (false);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	609
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	610 curr_lexer->current_input_column += yyleng;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	611 curr_lexer->looking_for_object_index = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	612 curr_lexer->at_beginning_of_statement = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	613
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	614 if (curr_lexer->defining_func
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	615 && ! curr_lexer->parsed_function_name.top ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	616 curr_lexer->looking_at_return_list = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	617 else
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	618 curr_lexer->looking_at_matrix_or_assign_lhs = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	619
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	620 curr_lexer->decrement_promptflag ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	621
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	622 curr_lexer->bracketflag++;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	623
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	624 curr_lexer->push_start_state (MATRIX_START);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	625
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	626 return curr_lexer->count_token ('[');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	627 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	628 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	629
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	630 \] {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	631 curr_lexer->lexer_debug ("\\]");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	632
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	633 curr_lexer->nesting_level.remove ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	634
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	635 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	636
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	637 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	638 curr_lexer->at_beginning_of_statement = false;
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	639
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	640 return curr_lexer->handle_token (']');
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	641 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	642
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	643 %{
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	644 // Gobble comments.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	645 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	646
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	647 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	648 // Start of a block comment. If the comment marker appears immediately
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	649 // after a block of full-line comments, finish the full line comment
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	650 // block.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	651 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	652
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	653 ^{S}{CCHAR}\{{S}{NL} {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	654 curr_lexer->lexer_debug ("^{S}{CCHAR}\\{{S}{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	655
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	656 yyless (0);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	657
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	658 if (curr_lexer->start_state () == LINE_COMMENT_START)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	659 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	660 if (! curr_lexer->comment_text.empty ())
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	661 curr_lexer->finish_comment (octave_comment_elt::full_line);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	662
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	663 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	664 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	665
16365 8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	666 curr_lexer->decrement_promptflag ();
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	667
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	668 curr_lexer->push_start_state (BLOCK_COMMENT_START);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	669
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	670 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	671
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	672 <BLOCK_COMMENT_START>^{S}{CCHAR}\{{S}{NL} {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	673 curr_lexer->lexer_debug ("<BLOCK_COMMENT_START>^{S}{CCHAR}\\{{S}{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	674
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	675 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	676 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	677
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	678 if (curr_lexer->block_comment_nesting_level)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	679 curr_lexer->comment_text = "\n";
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	680
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	681 curr_lexer->block_comment_nesting_level++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	682 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	683
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	684 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	685 // End of a block comment. If this block comment is nested inside
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	686 // another, wait for the outermost block comment block to be closed
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	687 // before storing the comment.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	688 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	689
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	690 <BLOCK_COMMENT_START>^{S}{CCHAR}\}{S}{NL} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	691 curr_lexer->lexer_debug ("<BLOCK_COMMENT_START>^{S}{CCHAR}\\}{S}{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	692
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	693 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	694 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	695
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	696 if (curr_lexer->block_comment_nesting_level > 1)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	697 curr_lexer->comment_text = "\n";
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	698 else
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	699 curr_lexer->finish_comment (octave_comment_elt::block);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	700
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	701 curr_lexer->block_comment_nesting_level--;
16364 1e064963c90a properly recognize nested block comments John W. Eaton <jwe@octave.org> parents: 16363 diff changeset	702
1e064963c90a properly recognize nested block comments John W. Eaton <jwe@octave.org> parents: 16363 diff changeset	703 if (curr_lexer->block_comment_nesting_level == 0)
16365 8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	704 {
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	705 curr_lexer->increment_promptflag ();
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	706
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	707 curr_lexer->pop_start_state ();
8097a052ec57 use secondary prompt when reading block comments John W. Eaton <jwe@octave.org> parents: 16364 diff changeset	708 }
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	709 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	710
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	711 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	712 // Body of a block comment.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	713 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	714
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	715 <BLOCK_COMMENT_START>{ANY_EXCEPT_NL}*{NL} {
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	716 curr_lexer->lexer_debug ("<BLOCK_COMMENT_START>{ANY_EXCEPT_NL}*{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	717
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	718 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	719 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	720 curr_lexer->comment_text += yytext;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	721 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	722
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	723 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	724 // Full-line or end-of-line comment.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	725 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	726
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	727 {S}{CCHAR}{ANY_EXCEPT_NL}{NL} {
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	728 curr_lexer->lexer_debug ("{S}{CCHAR}{ANY_EXCEPT_NL}{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	729
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	730 curr_lexer->push_start_state (LINE_COMMENT_START);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	731 yyless (0);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	732 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	733
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	734 <LINE_COMMENT_START>{S}{CCHAR}{ANY_EXCEPT_NL}{NL} {
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	735 curr_lexer->lexer_debug ("<LINE_COMMENT_START>{S}{CCHAR}{ANY_EXCEPT_NL}{NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	736
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	737 bool full_line_comment = curr_lexer->current_input_column == 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	738 curr_lexer->input_line_number++;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	739 curr_lexer->current_input_column = 1;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	740
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	741 bool have_space = false;
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	742 size_t len = yyleng;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	743 size_t i = 0;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	744 while (i < len)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	745 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	746 char c = yytext[i];
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	747 if (c == ' ' \|\| c == '\t')
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	748 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	749 have_space = true;
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	750 i++;
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	751 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	752 else
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	753 break;
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	754 }
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	755
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	756 size_t num_comment_chars = 0;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	757
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	758 while (i < len)
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	759 {
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	760 char c = yytext[i];
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	761 if (c == '#' \|\| c == '%')
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	762 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	763 num_comment_chars++;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	764 i++;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	765 }
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	766 else
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	767 break;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	768 }
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	769
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	770 curr_lexer->comment_text += &yytext[i];
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	771
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	772 if (full_line_comment)
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	773 {
17882 cf3f828f401c only allow [%#]{ as block comment start (bug #40513) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	774 if (num_comment_chars == 1 && yytext[i++] == '{')
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	775 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	776 bool looks_like_block_comment = true;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	777
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	778 while (i < len)
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	779 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	780 char c = yytext[i++];
18135 7af19113ec43 Fix block comments for files with CRLF line endings (bug #40894) John Donoghue <john.donoghue@ieee.org> parents: 17882 diff changeset	781 if (! (c == ' ' \|\| c == '\t' \|\| c == '\n' \|\| c == '\r'))
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	782 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	783 looks_like_block_comment = false;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	784 break;
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	785 }
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	786 }
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	787
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	788 if (looks_like_block_comment)
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	789 {
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	790 yyless (0);
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	791
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	792 curr_lexer->finish_comment (octave_comment_elt::full_line);
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	793
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	794 curr_lexer->pop_start_state ();
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	795 }
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	796 }
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	797 }
d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	798 else
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	799 {
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	800 if (have_space)
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	801 curr_lexer->mark_previous_token_trailing_space ();
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	802
16253 a89cf57ba3a5 partial cleanup of continuation handling in lexer John W. Eaton <jwe@octave.org> parents: 16231 diff changeset	803 curr_lexer->finish_comment (octave_comment_elt::end_of_line);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	804
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	805 curr_lexer->pop_start_state ();
16337 6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549) John W. Eaton <jwe@octave.org> parents: 16334 diff changeset	806
6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549) John W. Eaton <jwe@octave.org> parents: 16334 diff changeset	807 curr_lexer->xunput ('\n');
6bfd8dbd7d3c don't swallow statements that follow comment lines (bug #38549) John W. Eaton <jwe@octave.org> parents: 16334 diff changeset	808 curr_lexer->input_line_number--;
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	809 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	810 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	811
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	812 %{
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	813 // End of a block of full-line comments.
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	814 %}
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	815
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	816 <LINE_COMMENT_START>{ANY_INCLUDING_NL} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	817 curr_lexer->lexer_debug ("<LINE_COMMENT_START>{ANY_INCLUDING_NL}");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	818
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	819 curr_lexer->xunput (yytext[0]);
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	820
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	821 curr_lexer->finish_comment (octave_comment_elt::full_line);
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	822
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	823 curr_lexer->pop_start_state ();
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	824 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	825
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	826 %{
17722 5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342) John W. Eaton <jwe@octave.org> parents: 17693 diff changeset	827 // End of a block of full-line comments.
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342) John W. Eaton <jwe@octave.org> parents: 17693 diff changeset	828 %}
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342) John W. Eaton <jwe@octave.org> parents: 17693 diff changeset	829
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342) John W. Eaton <jwe@octave.org> parents: 17693 diff changeset	830 <LINE_COMMENT_START><<EOF>> {
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342) John W. Eaton <jwe@octave.org> parents: 17693 diff changeset	831 curr_lexer->lexer_debug ("<LINE_COMMENT_START><<EOF>>");
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342) John W. Eaton <jwe@octave.org> parents: 17693 diff changeset	832
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342) John W. Eaton <jwe@octave.org> parents: 17693 diff changeset	833 curr_lexer->finish_comment (octave_comment_elt::full_line);
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342) John W. Eaton <jwe@octave.org> parents: 17693 diff changeset	834
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342) John W. Eaton <jwe@octave.org> parents: 17693 diff changeset	835 curr_lexer->pop_start_state ();
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342) John W. Eaton <jwe@octave.org> parents: 17693 diff changeset	836 }
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342) John W. Eaton <jwe@octave.org> parents: 17693 diff changeset	837
5b0036d89d4a allow "help dir-name" to work when comment block ends at EOF (bug #40342) John W. Eaton <jwe@octave.org> parents: 17693 diff changeset	838 %{
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	839 // Double-quoted character strings.
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	840 %}
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	841
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	842 <DQ_STRING_START>\"\" {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	843 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\"\\\"");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	844
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	845 curr_lexer->current_input_column += yyleng;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	846 curr_lexer->string_text += '"';
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	847 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	848
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	849 <DQ_STRING_START>\" {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	850 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\"");
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	851
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	852 curr_lexer->current_input_column++;
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	853
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	854 curr_lexer->pop_start_state ();
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	855
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	856 if (curr_lexer->start_state() != COMMAND_START)
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	857 {
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	858 curr_lexer->looking_for_object_index = true;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	859 curr_lexer->at_beginning_of_statement = false;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	860
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	861 curr_lexer->push_token (new octave::token (DQ_STRING,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	862 curr_lexer->string_text,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	863 curr_lexer->string_line,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	864 curr_lexer->string_column));
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	865
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	866 curr_lexer->string_text = "";
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	867
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	868 return curr_lexer->count_token_internal (DQ_STRING);
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	869 }
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	870 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	871
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	872 <DQ_STRING_START>\\[0-7]{1,3} {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	873 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\[0-7]{1,3}");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	874
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	875 curr_lexer->current_input_column += yyleng;
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	876
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	877 int result;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	878 sscanf (yytext+1, "%o", &result);
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	879
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	880 if (result > 0xff)
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	881 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	882 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	883 = new octave::token (LEXICAL_ERROR,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	884 "invalid octal escape sequence in character string",
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	885 curr_lexer->input_line_number,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	886 curr_lexer->current_input_column);
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	887
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	888 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	889
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	890 return curr_lexer->count_token_internal (LEXICAL_ERROR);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	891 }
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	892 else
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	893 curr_lexer->string_text += static_cast<unsigned char> (result);
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	894 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	895
17244 9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	896 <DQ_STRING_START>\\x[0-9a-fA-F]+ {
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	897 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\x[0-9a-fA-F]+");
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	898
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	899 curr_lexer->current_input_column += yyleng;
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	900
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	901 int result;
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	902 sscanf (yytext+2, "%x", &result);
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	903
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	904 // Truncate the value silently instead of checking the range like
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	905 // we do for octal above. This is to match C/C++ where any number
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	906 // of digits is allowed but the value is implementation-defined if
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	907 // it exceeds the range of the character type.
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	908 curr_lexer->string_text += static_cast<unsigned char> (result);
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	909 }
9de751a10910 Add support for hexadecimal escape sequences in double-quoted strings (bug #39775) Mike Miller <mtmiller@ieee.org> parents: 16914 diff changeset	910
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	911 <DQ_STRING_START>"\\a" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	912 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\a\"");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	913
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	914 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	915 curr_lexer->string_text += '\a';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	916 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	917
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	918 <DQ_STRING_START>"\\b" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	919 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\b\"");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	920
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	921 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	922 curr_lexer->string_text += '\b';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	923 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	924
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	925 <DQ_STRING_START>"\\f" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	926 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\f\"");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	927
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	928 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	929 curr_lexer->string_text += '\f';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	930 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	931
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	932 <DQ_STRING_START>"\\n" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	933 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\n\"");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	934
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	935 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	936 curr_lexer->string_text += '\n';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	937 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	938
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	939 <DQ_STRING_START>"\\r" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	940 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\r\"");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	941
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	942 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	943 curr_lexer->string_text += '\r';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	944 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	945
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	946 <DQ_STRING_START>"\\t" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	947 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\t\"");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	948
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	949 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	950 curr_lexer->string_text += '\t';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	951 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	952
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	953 <DQ_STRING_START>"\\v" {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	954 curr_lexer->lexer_debug ("<DQ_STRING_START>\"\\\\v\"");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	955
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	956 curr_lexer->current_input_column += yyleng;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	957 curr_lexer->string_text += '\v';
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	958 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	959
18428 4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415). Stefan Mahr <dac922@gmx.de> parents: 18319 diff changeset	960 <DQ_STRING_START>(\.\.\.){S}*{NL} {
4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415). Stefan Mahr <dac922@gmx.de> parents: 18319 diff changeset	961 curr_lexer->lexer_debug ("<DQ_STRING_START>(\\.\\.\\.){S}*{NL}");
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	962
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	963 static const char *msg = "'...' continuations in double-quoted character strings are obsolete and will not be allowed in a future version of Octave; please use '\\' instead";
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	964
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	965 std::string nm = curr_lexer->fcn_file_full_name;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	966
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	967 if (nm.empty ())
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	968 warning_with_id ("Octave:deprecated-syntax", "%s", msg);
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	969 else
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	970 warning_with_id ("Octave:deprecated-syntax",
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	971 "%s; near line %d of file '%s'", msg,
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	972 curr_lexer->input_line_number, nm.c_str ());
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	973
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	974 HANDLE_STRING_CONTINUATION;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	975 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	976
18428 4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415). Stefan Mahr <dac922@gmx.de> parents: 18319 diff changeset	977 <DQ_STRING_START>\\{S}+{NL} {
4d2e15abe5e7 Disallow comments after continuation in double-quoted strings (bug #41415). Stefan Mahr <dac922@gmx.de> parents: 18319 diff changeset	978 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\{S}+{NL}");
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	979
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	980 static const char *msg = "white space and comments after continuation markers in double-quoted character strings are obsolete and will not be allowed in a future version of Octave";
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	981
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	982 std::string nm = curr_lexer->fcn_file_full_name;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	983
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	984 if (nm.empty ())
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	985 warning_with_id ("Octave:deprecated-syntax", "%s", msg);
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	986 else
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	987 warning_with_id ("Octave:deprecated-syntax",
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	988 "%s; near line %d of file '%s'", msg,
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	989 curr_lexer->input_line_number, nm.c_str ());
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	990
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	991 HANDLE_STRING_CONTINUATION;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	992 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	993
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	994 <DQ_STRING_START>\\{NL} {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	995 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\{NL}");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	996
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	997 HANDLE_STRING_CONTINUATION;
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	998 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	999
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1000 <DQ_STRING_START>\\. {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1001 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\.");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1002
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1003 curr_lexer->current_input_column += yyleng;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1004 curr_lexer->string_text += yytext[1];
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1005 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1006
16914 bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1007 <DQ_STRING_START>\. {
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1008 curr_lexer->lexer_debug ("<DQ_STRING_START>\\.");
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1009
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1010 curr_lexer->current_input_column++;
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1011 curr_lexer->string_text += yytext[0];
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1012 }
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1013
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1014 <DQ_STRING_START>[^\.\\\r\n\"]+ {
bc12849bb6cc deprecate ... and whitespace/comments after continuation markers in strings John W. Eaton <jwe@octave.org> parents: 16904 diff changeset	1015 curr_lexer->lexer_debug ("<DQ_STRING_START>[^\\.\\\\\\r\\n\\\"]+");
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1016
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1017 curr_lexer->current_input_column += yyleng;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1018 curr_lexer->string_text += yytext;
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1019 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1020
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1021 <DQ_STRING_START>{NL} {
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1022 curr_lexer->lexer_debug ("<DQ_STRING_START>{NL}");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1023
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1024 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1025 = new octave::token (LEXICAL_ERROR,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1026 "unterminated character string constant",
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1027 curr_lexer->input_line_number,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1028 curr_lexer->current_input_column);
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1029
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1030 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1031
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1032 curr_lexer->input_line_number++;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1033 curr_lexer->current_input_column = 1;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1034
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1035 return curr_lexer->count_token_internal (LEXICAL_ERROR);
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1036 }
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1037
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1038 %{
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1039 // Single-quoted character strings.
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1040 %}
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1041
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1042 <SQ_STRING_START>\'\' {
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1043 curr_lexer->lexer_debug ("<SQ_STRING_START>\\'\\'");
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1044
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1045 curr_lexer->current_input_column += yyleng;
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1046 curr_lexer->string_text += '\'';
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1047 }
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1048
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1049 <SQ_STRING_START>\' {
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1050 curr_lexer->lexer_debug ("<SQ_STRING_START>\\'");
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1051
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1052 curr_lexer->current_input_column++;
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1053
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1054 curr_lexer->pop_start_state ();
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1055
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1056 if (curr_lexer->start_state() != COMMAND_START)
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1057 {
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1058 curr_lexer->looking_for_object_index = true;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1059 curr_lexer->at_beginning_of_statement = false;
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1060
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1061 curr_lexer->push_token (new octave::token (SQ_STRING,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1062 curr_lexer->string_text,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1063 curr_lexer->string_line,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1064 curr_lexer->string_column));
18224 615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1065
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1066 curr_lexer->string_text = "";
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1067
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1068 return curr_lexer->count_token_internal (SQ_STRING);
615fdd2238c1 improve compatibility of command syntax parsing (bug #41032) Michael C. Grant <mcg@cvxr.com> parents: 18139 diff changeset	1069 }
16904 f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1070 }
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1071
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1072 <SQ_STRING_START>[^\'\n\r]+ {
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1073 curr_lexer->lexer_debug ("<SQ_STRING_START>[^\\'\\n\\r]+");
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1074
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1075 curr_lexer->current_input_column += yyleng;
f29dd5a7591d more tweaks for parsing character strings John W. Eaton <jwe@octave.org> parents: 16903 diff changeset	1076 curr_lexer->string_text += yytext;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1077 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1078
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1079 <SQ_STRING_START>{NL} {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1080 curr_lexer->lexer_debug ("<SQ_STRING_START>{NL}");
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1081
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1082 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1083 = new octave::token (LEXICAL_ERROR,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1084 "unterminated character string constant",
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1085 curr_lexer->input_line_number,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1086 curr_lexer->current_input_column);
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1087
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1088 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1089
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1090 curr_lexer->input_line_number++;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1091 curr_lexer->current_input_column = 1;
f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1092
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1093 return curr_lexer->count_token_internal (LEXICAL_ERROR);
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1094 }
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1095
531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1096 %{
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1097 // Fully-qualified identifiers (used for classdef).
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1098 %}
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1099
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1100 <FQ_IDENT_START>{FQIDENT} {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1101 curr_lexer->lexer_debug ("<FQ_IDENT_START>{FQIDENT}");
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1102 curr_lexer->pop_start_state ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1103
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1104 int id_tok = curr_lexer->handle_fq_identifier ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1105
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1106 if (id_tok >= 0)
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1107 {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1108 curr_lexer->looking_for_object_index = true;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1109
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1110 return curr_lexer->count_token_internal (id_tok);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1111 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1112 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1113
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1114 <FQ_IDENT_START>{S}+ {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1115 curr_lexer->current_input_column += yyleng;
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1116
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1117 curr_lexer->mark_previous_token_trailing_space ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1118 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1119
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1120 <FQ_IDENT_START>. {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1121 yyless (0);
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1122 curr_lexer->pop_start_state ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1123 }
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1124
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1125 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1126 // Imaginary numbers.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1127 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1128
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1129 {NUMBER}{Im} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1130 curr_lexer->lexer_debug ("{NUMBER}{Im}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1131
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1132 if (curr_lexer->previous_token_may_be_command ()
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1133 && curr_lexer->space_follows_previous_token ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1134 {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1135 yyless (0);
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1136 curr_lexer->push_start_state (COMMAND_START);
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1137 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1138 else
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1139 {
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1140 int tok = curr_lexer->previous_token_value ();
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1141
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1142 if (curr_lexer->whitespace_is_significant ()
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1143 && curr_lexer->space_follows_previous_token ()
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1144 && ! (tok == '[' \|\| tok == '{'
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1145 \|\| curr_lexer->previous_token_is_binop ()))
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1146 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1147 yyless (0);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1148 unput (',');
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1149 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1150 else
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1151 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1152 curr_lexer->handle_number ();
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1153 return curr_lexer->count_token_internal (IMAG_NUM);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1154 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1155 }
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1156 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1157
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1158 %{
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14161 diff changeset	1159 // 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	1160 // the constant.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1161 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1162
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	1163 {D}{D_}/\.[\/\\^\'] \|
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1164 {NUMBER} {
20588 e34692daf663 Extend parser to accept '_' in numbers. Rik <rik@octave.org> parents: 20547 diff changeset	1165 curr_lexer->lexer_debug ("{D}{D_}/\\.[\\/\\\\^\\']\|{NUMBER}");
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1166
16361 e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1167 if (curr_lexer->previous_token_may_be_command ()
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1168 && curr_lexer->space_follows_previous_token ())
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1169 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1170 yyless (0);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1171 curr_lexer->push_start_state (COMMAND_START);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1172 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1173 else
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1174 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1175 int tok = curr_lexer->previous_token_value ();
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1176
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1177 if (curr_lexer->whitespace_is_significant ()
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1178 && curr_lexer->space_follows_previous_token ()
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1179 && ! (tok == '[' \|\| tok == '{'
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1180 \|\| curr_lexer->previous_token_is_binop ()))
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1181 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1182 yyless (0);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1183 unput (',');
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1184 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1185 else
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1186 {
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1187 curr_lexer->handle_number ();
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1188 return curr_lexer->count_token_internal (NUM);
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1189 }
e1dcd834751f and foo NUMBER as command syntax (bug #38565) John W. Eaton <jwe@octave.org> parents: 16360 diff changeset	1190 }
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1191 }
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1192
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1193 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1194 // 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	1195 // the <MATRIX_START> start state code above.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1196 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1197
16363 d16c255299c0 recognize block comment begin while processing line comments (bug #38559) John W. Eaton <jwe@octave.org> parents: 16361 diff changeset	1198 {S}+ {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1199 curr_lexer->current_input_column += yyleng;
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	1200
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	1201 curr_lexer->mark_previous_token_trailing_space ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1202 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1203
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1204 %{
17247 e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1205 // Continuation lines. Allow arbitrary text after continuations.
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1206 %}
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1207
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	1208 \.\.\.{ANY_EXCEPT_NL}*{NL} {
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	1209 curr_lexer->lexer_debug ("\\.\\.\\.{ANY_EXCEPT_NL}*{NL}");
17247 e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1210
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1211 curr_lexer->handle_continuation ();
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1212 }
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1213
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1214 %{
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1215 // Deprecated C preprocessor style continuation markers.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1216 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1217
17246 8be8a65d3ca8 Ignore anything after the continuation marker '...' (bug #38653) Stefan Mahr <dac922@gmx.de> parents: 17244 diff changeset	1218 \\{S}*{NL} \|
18311 b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	1219 \\{S}{CCHAR}{ANY_EXCEPT_NL}{NL} {
b14cdae65abd prevent lexer from matching patterns across CR line endings (bug #41281) John W. Eaton <jwe@octave.org> parents: 18246 diff changeset	1220 curr_lexer->lexer_debug ("\\\\{S}{NL}\|\\\\{S}{CCHAR}{ANY_EXCEPT_NL}*{NL}");
17247 e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1221
22505 7bdc80232cdc Expand warning for '\' continuation marker to recommend "..." (bug #48810). Rik <rik@octave.org> parents: 22323 diff changeset	1222 static const char *msg = "using continuation marker \\ outside of double quoted strings is deprecated and will be removed from a future version of Octave, use ... instead";
17247 e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1223
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1224 std::string nm = curr_lexer->fcn_file_full_name;
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1225
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1226 if (nm.empty ())
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1227 warning_with_id ("Octave:deprecated-syntax", "%s", msg);
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1228 else
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1229 warning_with_id ("Octave:deprecated-syntax",
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1230 "%s; near line %d of file '%s'", msg,
e993fa124b46 Deprecate \ as continuation marker outside of double-quoted character strings. John W. Eaton <jwe@octave.org> parents: 17246 diff changeset	1231 curr_lexer->input_line_number, nm.c_str ());
17343 6470a113eae2 correctly handle deprecated \ continuation markers John W. Eaton <jwe@octave.org> parents: 17247 diff changeset	1232
6470a113eae2 correctly handle deprecated \ continuation markers John W. Eaton <jwe@octave.org> parents: 17247 diff changeset	1233 curr_lexer->handle_continuation ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1234 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1235
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1236 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1237 // End of file.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1238 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1239
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1240 <<EOF>> {
16164 c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	1241 return curr_lexer->handle_end_of_input ();
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1242 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1243
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1244 %{
16259 0b5ab09dfce4 2/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16257 diff changeset	1245 // Identifiers.
18394 fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1246
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1247 // Don't allow get and set to be recognized as keywords if they are
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1248 // followed by "(".
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1249 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1250
21705 764e586dca4b Avoid use of REJECT in parser (bug #45947). Rik <rik@octave.org> parents: 21635 diff changeset	1251 (set\|get){S}*\( {
21722 fb5dd9f7d697 * oct-parse.in.yy: Correct pattern string in call to HANDLE_IDENTIFIER. John W. Eaton <jwe@octave.org> parents: 21705 diff changeset	1252 HANDLE_IDENTIFIER ("(set\|get){S}*\\(", true);
18394 fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1253 }
fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1254
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1255 {IDENT} {
18394 fc0ce9eb9d82 don't allow get and set followed by "(" to be recognized as keywords. John W. Eaton <jwe@octave.org> parents: 18341 diff changeset	1256 HANDLE_IDENTIFIER ("{IDENT}", false);
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1257 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1258
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1259 %{
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1260 // Superclass method identifiers.
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1261 %}
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1262
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1263 {IDENT}@{FQIDENT} {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1264 curr_lexer->lexer_debug ("{IDENT}@{FQIDENT}");
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1265
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1266 if (curr_lexer->previous_token_may_be_command ())
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1267 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1268 yyless (0);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1269 curr_lexer->push_start_state (COMMAND_START);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1270 }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1271 else
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1272 {
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1273 int id_tok = curr_lexer->handle_superclass_identifier ();
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1274
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1275 if (id_tok >= 0)
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1276 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1277 curr_lexer->looking_for_object_index = true;
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1278
16683 e1c6ad54259f maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16645 16681 diff changeset	1279 return curr_lexer->count_token_internal (id_tok);
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1280 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1281 }
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1282 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1283
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1284 %{
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1285 // Metaclass query
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1286 %}
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1287
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1288 \?{FQIDENT} {
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18497 diff changeset	1289 curr_lexer->lexer_debug ("\\?{FQIDENT}");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1290
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1291 if (curr_lexer->previous_token_may_be_command ()
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1292 && curr_lexer->space_follows_previous_token ())
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1293 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1294 yyless (0);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1295 curr_lexer->push_start_state (COMMAND_START);
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1296 }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1297 else
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1298 {
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1299 int id_tok = curr_lexer->handle_meta_identifier ();
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1300
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1301 if (id_tok >= 0)
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1302 {
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1303 curr_lexer->looking_for_object_index = true;
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1304
16683 e1c6ad54259f maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16645 16681 diff changeset	1305 return curr_lexer->count_token_internal (id_tok);
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1306 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1307 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1308 }
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1309
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4923 diff changeset	1310 "@" {
18492 e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1311 curr_lexer->lexer_debug ("@");
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1312
16334 06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1313 if (curr_lexer->previous_token_may_be_command ()
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1314 && curr_lexer->space_follows_previous_token ())
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1315 {
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1316 yyless (0);
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1317 curr_lexer->push_start_state (COMMAND_START);
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1318 }
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1319 else
06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1320 {
18492 e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1321 int tok = curr_lexer->previous_token_value ();
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1322
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1323 if (curr_lexer->whitespace_is_significant ()
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1324 && curr_lexer->space_follows_previous_token ()
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1325 && ! (tok == '[' \|\| tok == '{'
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1326 \|\| curr_lexer->previous_token_is_binop ()))
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1327 {
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1328 yyless (0);
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1329 unput (',');
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1330 }
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1331 else
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1332 {
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1333 curr_lexer->current_input_column++;
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1334
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1335 curr_lexer->looking_at_function_handle++;
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1336 curr_lexer->looking_for_object_index = false;
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1337 curr_lexer->at_beginning_of_statement = false;
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1338
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1339 return curr_lexer->count_token ('@');
e4c319ed2414 Fix regression, allow space-separated cell array of function handles (bug #41569) Mike Miller <mtmiller@ieee.org> parents: 18428 diff changeset	1340 }
16334 06aa4c0f2018 handle foo @... as command syntax John W. Eaton <jwe@octave.org> parents: 16325 diff changeset	1341 }
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	1342 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	1343
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4323 diff changeset	1344 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1345 // 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	1346 // 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	1347 // 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	1348 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1349
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1350 {NL} {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1351 curr_lexer->lexer_debug ("{NL}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1352
16309 e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1353 if (curr_lexer->nesting_level.is_paren ())
e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1354 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1355 curr_lexer->input_line_number++;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1356 curr_lexer->current_input_column = 1;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1357
16309 e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1358 curr_lexer->at_beginning_of_statement = false;
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	1359 curr_lexer->warn_language_extension
16309 e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1360 ("bare newline inside parentheses");
e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1361 }
e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1362 else if (curr_lexer->nesting_level.none ()
e608de76742c allow newline to terminate anonymous function definition John W. Eaton <jwe@octave.org> parents: 16299 diff changeset	1363 \|\| curr_lexer->nesting_level.is_anon_fcn_body ())
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	1364 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1365 curr_lexer->input_line_number++;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1366 curr_lexer->current_input_column = 1;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1367
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1368 curr_lexer->at_beginning_of_statement = true;
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1369
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1370 return curr_lexer->count_token ('\n');
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	1371 }
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1372 else if (curr_lexer->nesting_level.is_bracket_or_brace ())
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1373 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1374 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1375 = new octave::token (LEXICAL_ERROR,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1376 "unexpected internal lexer error",
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1377 curr_lexer->input_line_number,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1378 curr_lexer->current_input_column);
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1379
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1380 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1381
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1382 curr_lexer->input_line_number++;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1383 curr_lexer->current_input_column = 1;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1384
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1385 return curr_lexer->count_token_internal (LEXICAL_ERROR);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1386 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1387 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1388
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1389 %{
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1390 // 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	1391 // operator.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1392 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1393
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1394 "'" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1395 curr_lexer->lexer_debug ("'");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1396
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1397 if (curr_lexer->previous_token_may_be_command ()
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1398 && curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1399 {
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1400 curr_lexer->current_input_column++;
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1401 curr_lexer->push_start_state (COMMAND_START);
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1402 curr_lexer->begin_string (SQ_STRING_START);
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1403 }
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16680 diff changeset	1404 else if (curr_lexer->at_beginning_of_statement)
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16680 diff changeset	1405 {
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16680 diff changeset	1406 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1407 curr_lexer->begin_string (SQ_STRING_START);
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16680 diff changeset	1408 }
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1409 else
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1410 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1411 int tok = curr_lexer->previous_token_value ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1412
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1413 if (curr_lexer->whitespace_is_significant ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1414 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1415 if (curr_lexer->space_follows_previous_token ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1416 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1417 if (tok == '[' \|\| tok == '{'
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1418 \|\| curr_lexer->previous_token_is_binop ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1419 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1420 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1421 curr_lexer->begin_string (SQ_STRING_START);
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1422 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1423 else
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1424 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1425 yyless (0);
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1426 curr_lexer->xunput (',');
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1427 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1428 curr_lexer->current_input_column--;
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1429 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1430 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1431 else
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1432 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1433 if (tok == '[' \|\| tok == '{'
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1434 \|\| curr_lexer->previous_token_is_binop ()
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1435 \|\| curr_lexer->previous_token_is_keyword ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1436 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1437 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1438 curr_lexer->begin_string (SQ_STRING_START);
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1439 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1440 else
16284 09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. John W. Eaton <jwe@octave.org> parents: 16283 diff changeset	1441 return curr_lexer->count_token (HERMITIAN);
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1442 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1443 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1444 else
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1445 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1446 if (! tok \|\| tok == '[' \|\| tok == '{' \|\| tok == '('
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1447 \|\| curr_lexer->previous_token_is_binop ()
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1448 \|\| curr_lexer->previous_token_is_keyword ())
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1449 {
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1450 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1451 curr_lexer->begin_string (SQ_STRING_START);
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1452 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1453 else
16284 09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. John W. Eaton <jwe@octave.org> parents: 16283 diff changeset	1454 return curr_lexer->count_token (HERMITIAN);
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1455 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1456 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1457 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1458
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1459 %{
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1460 // Double quotes always begin strings.
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1461 %}
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1462
973 46673c918034 [project @ 1994-12-12 17:50:07 by jwe] jwe parents: 972 diff changeset	1463 \" {
16903 f21194531877 improve character string handling in the lexer John W. Eaton <jwe@octave.org> parents: 16898 diff changeset	1464 curr_lexer->lexer_debug ("\\\"");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1465
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1466 if (curr_lexer->previous_token_may_be_command ()
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1467 && curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1468 {
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1469 curr_lexer->current_input_column++;
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1470 curr_lexer->push_start_state (COMMAND_START);
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1471 curr_lexer->begin_string (DQ_STRING_START);
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1472 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1473 else
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1474 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1475 int tok = curr_lexer->previous_token_value ();
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1476
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1477 if (curr_lexer->whitespace_is_significant ())
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1478 {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1479 if (curr_lexer->space_follows_previous_token ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1480 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1481 if (tok == '[' \|\| tok == '{'
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1482 \|\| curr_lexer->previous_token_is_binop ())
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1483 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1484 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1485 curr_lexer->begin_string (DQ_STRING_START);
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1486 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1487 else
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1488 {
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1489 yyless (0);
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1490 curr_lexer->xunput (',');
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1491 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1492 curr_lexer->current_input_column--;
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1493 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1494 }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1495 else
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1496 {
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1497 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1498 curr_lexer->begin_string (DQ_STRING_START);
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1499 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1500 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1501 else
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1502 {
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1503 curr_lexer->current_input_column++;
16898 531473481084 rewrite string parsing to avoid unlimited lookahead John W. Eaton <jwe@octave.org> parents: 16788 diff changeset	1504 curr_lexer->begin_string (DQ_STRING_START);
16261 b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1505 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1506 }
b45a90cdb0ae 3/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	1507 }
971 fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1508
fe71abb43457 [project @ 1994-12-12 15:10:22 by jwe] jwe parents: 970 diff changeset	1509 %{
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1510 // Other operators.
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1511 %}
9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1512
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1513 ":" { CMD_OR_OP (":", ':', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1514 ".+" { CMD_OR_OP (".+", EPLUS, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1515 ".-" { CMD_OR_OP (".-", EMINUS, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1516 "." { CMD_OR_OP (".", EMUL, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1517 "./" { CMD_OR_OP ("./", EDIV, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1518 ".\\" { CMD_OR_OP (".\\", ELEFTDIV, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1519 ".^" { CMD_OR_OP (".^", EPOW, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1520 "." { CMD_OR_OP (".", EPOW, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1521 "<=" { CMD_OR_OP ("<=", EXPR_LE, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1522 "==" { CMD_OR_OP ("==", EXPR_EQ, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1523 "~=" { CMD_OR_OP ("~=", EXPR_NE, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1524 "!=" { CMD_OR_OP ("!=", EXPR_NE, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1525 ">=" { CMD_OR_OP (">=", EXPR_GE, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1526 "&" { CMD_OR_OP ("&", EXPR_AND, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1527 "\|" { CMD_OR_OP ("\|", EXPR_OR, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1528 "<" { CMD_OR_OP ("<", EXPR_LT, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1529 ">" { CMD_OR_OP (">", EXPR_GT, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1530 "" { CMD_OR_OP ("", '*', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1531 "/" { CMD_OR_OP ("/", '/', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1532
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1533 %{
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1534 // In Matlab, '\' may also trigger command syntax.
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1535 %}
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1536
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1537 "\\" { return curr_lexer->handle_op ("\\", LEFTDIV); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1538
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1539 "^" { CMD_OR_OP ("^", POW, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1540 "" { CMD_OR_OP ("", POW, false); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1541 "&&" { CMD_OR_OP ("&&", EXPR_AND_AND, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1542 "\|\|" { CMD_OR_OP ("\|\|", EXPR_OR_OR, true); }
16265 71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1543
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1544 ";" {
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1545 bool at_beginning_of_statement
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1546 = (! (curr_lexer->whitespace_is_significant ()
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1547 \|\| curr_lexer->looking_at_object_index.front ()));
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1548
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1549 return curr_lexer->handle_op (";", ';', at_beginning_of_statement);
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1550 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1551
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1552 "+" { CMD_OR_UNARY_OP ("+", '+', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1553 "-" { CMD_OR_UNARY_OP ("-", '-', true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1554
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1555 "~" { CMD_OR_UNARY_OP ("~", EXPR_NOT, true); }
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1556 "!" { CMD_OR_UNARY_OP ("!", EXPR_NOT, false); }
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1557
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1558 "," {
16265 71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1559 bool at_beginning_of_statement
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1560 = (! (curr_lexer->whitespace_is_significant ()
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1561 \|\| curr_lexer->looking_at_object_index.front ()));
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1562
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1563 return curr_lexer->handle_op (",", ',', at_beginning_of_statement);
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1564 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1565
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1566 ".'" {
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1567 return curr_lexer->handle_op (".'", TRANSPOSE, false);
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1568 }
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1569
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1570 "++" { CMD_OR_UNARY_OP ("++", PLUS_PLUS, false); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1571 "--" { CMD_OR_UNARY_OP ("--", MINUS_MINUS, false); }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1572
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1573 "(" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1574 curr_lexer->lexer_debug ("(");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1575
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1576 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1577
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1578 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1579 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1580 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1581 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1582
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1583 if (! (tok == '[' \|\| tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1584 \|\| curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1585 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1586 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1587
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1588 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1589 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1590 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1591 curr_lexer->xunput (',');
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1592 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1593 curr_lexer->current_input_column--;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1594 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1595 else
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1596 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1597 // If we are looking for an object index, then push TRUE for
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1598 // looking_at_object_index. Otherwise, just push whatever state
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1599 // is current (so that we can pop it off the stack when we find
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1600 // the matching close paren).
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1601
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1602 curr_lexer->looking_at_object_index.push_front
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1603 (curr_lexer->looking_for_object_index);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1604
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1605 curr_lexer->looking_at_indirect_ref = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1606 curr_lexer->looking_for_object_index = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1607 curr_lexer->at_beginning_of_statement = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1608
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1609 curr_lexer->nesting_level.paren ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1610 curr_lexer->decrement_promptflag ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1611
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1612 return curr_lexer->handle_token ('(');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1613 }
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1614 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1615
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1616 ")" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1617 curr_lexer->lexer_debug (")");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1618
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1619 curr_lexer->nesting_level.remove ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1620 curr_lexer->current_input_column++;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1621
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1622 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1623
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1624 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1625 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1626
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1627 if (curr_lexer->looking_at_anon_fcn_args)
16265 71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1628 {
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1629 curr_lexer->looking_at_anon_fcn_args = false;
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1630 curr_lexer->nesting_level.anon_fcn_body ();
71ee3afedb69 5/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16263 diff changeset	1631 }
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 12801 diff changeset	1632
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1633 return curr_lexer->count_token (')');
967 b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1634 }
b228d6cd59a1 [project @ 1994-12-10 00:15:41 by jwe] jwe parents: 947 diff changeset	1635
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1636 "." {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1637 curr_lexer->lexer_debug (".");
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1638
16325 fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1639 if (curr_lexer->previous_token_may_be_command ()
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1640 && curr_lexer->space_follows_previous_token ())
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1641 {
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1642 yyless (0);
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1643 curr_lexer->push_start_state (COMMAND_START);
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1644 }
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1645 else
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1646 {
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1647 curr_lexer->looking_for_object_index = false;
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1648 curr_lexer->at_beginning_of_statement = false;
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1649
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1650 return curr_lexer->handle_token ('.');
fc565603ccbb also accept "." as possibly beginning a command John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1651 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1652 }
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1653
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1654 %{
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1655 // = and op= operators.
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1656 %}
7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1657
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1658 "=" {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1659 curr_lexer->maybe_mark_previous_token_as_variable ();
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1660
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1661 return curr_lexer->handle_op ("=", '=');
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1662 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	1663
16680 de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1664 "+=" { CMD_OR_COMPUTED_ASSIGN_OP ("+=", ADD_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1665 "-=" { CMD_OR_COMPUTED_ASSIGN_OP ("-=", SUB_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1666 "=" { CMD_OR_COMPUTED_ASSIGN_OP ("=", MUL_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1667 "/=" { CMD_OR_COMPUTED_ASSIGN_OP ("/=", DIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1668 "\\=" { CMD_OR_COMPUTED_ASSIGN_OP ("\\=", LEFTDIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1669 ".+=" { CMD_OR_COMPUTED_ASSIGN_OP (".+=", ADD_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1670 ".-=" { CMD_OR_COMPUTED_ASSIGN_OP (".-=", SUB_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1671 ".=" { CMD_OR_COMPUTED_ASSIGN_OP (".=", EMUL_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1672 "./=" { CMD_OR_COMPUTED_ASSIGN_OP ("./=", EDIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1673 ".\\=" { CMD_OR_COMPUTED_ASSIGN_OP (".\\=", ELEFTDIV_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1674 "^=" { CMD_OR_COMPUTED_ASSIGN_OP ("^=", POW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1675 "**=" { CMD_OR_COMPUTED_ASSIGN_OP ("^=", POW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1676 ".^=" { CMD_OR_COMPUTED_ASSIGN_OP (".^=", EPOW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1677 ".**=" { CMD_OR_COMPUTED_ASSIGN_OP (".^=", EPOW_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1678 "&=" { CMD_OR_COMPUTED_ASSIGN_OP ("&=", AND_EQ); }
de79cdbbdf7c improve parsing of commands John W. Eaton <jwe@octave.org> parents: 16643 diff changeset	1679 "\|=" { CMD_OR_COMPUTED_ASSIGN_OP ("\|=", OR_EQ); }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1680
16275 dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1681 %{
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1682 // In Matlab, '{' may also trigger command syntax.
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1683 %}
dd7de0345124 10/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1684
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1685 "{" {
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	1686 curr_lexer->lexer_debug ("{");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1687
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1688 bool unput_comma = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1689
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1690 if (curr_lexer->whitespace_is_significant ()
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1691 && curr_lexer->space_follows_previous_token ())
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1692 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1693 int tok = curr_lexer->previous_token_value ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1694
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1695 if (! (tok == '[' \|\| tok == '{'
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1696 \|\| curr_lexer->previous_token_is_binop ()))
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1697 unput_comma = true;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1698 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1699
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1700 if (unput_comma)
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1701 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1702 yyless (0);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1703 curr_lexer->xunput (',');
16281 1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1704 // Adjust for comma that was not really in the input stream.
1bbc2fc552cf adjust line and column info when inserting new text in lexer input stream John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1705 curr_lexer->current_input_column--;
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1706 }
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1707 else
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1708 {
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1709 curr_lexer->nesting_level.brace ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1710
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1711 curr_lexer->looking_at_object_index.push_front
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1712 (curr_lexer->looking_for_object_index);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1713
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1714 curr_lexer->current_input_column += yyleng;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1715 curr_lexer->looking_for_object_index = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1716 curr_lexer->at_beginning_of_statement = false;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1717
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1718 curr_lexer->decrement_promptflag ();
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1719
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1720 curr_lexer->braceflag++;
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1721
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1722 curr_lexer->push_start_state (MATRIX_START);
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1723
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1724 return curr_lexer->count_token ('{');
9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16261 diff changeset	1725 }
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1726 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1727
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1728 "}" {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1729 curr_lexer->lexer_debug ("}");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1730
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1731 curr_lexer->looking_at_object_index.pop_front ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1732
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1733 curr_lexer->looking_for_object_index = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1734 curr_lexer->at_beginning_of_statement = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1735
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1736 curr_lexer->nesting_level.remove ();
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1737
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1738 return curr_lexer->handle_token ('}');
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1739 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3332 diff changeset	1740
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1741 %{
2066 a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe] jwe parents: 2042 diff changeset	1742 // Unrecognized input is a lexical error.
968 9351572b7210 [project @ 1994-12-11 21:53:00 by jwe] jwe parents: 967 diff changeset	1743 %}
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1744
2042 31f4f775b8c6 [project @ 1996-03-28 09:06:28 by jwe] jwe parents: 1994 diff changeset	1745 . {
16229 7b7b1e4968e8 use functions instead of token return macros in lexer John W. Eaton <jwe@octave.org> parents: 16228 diff changeset	1746 curr_lexer->lexer_debug (".");
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1747
16125 96a58f197f93 allow xunput to be called without buffer argument John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	1748 curr_lexer->xunput (yytext[0]);
16113 7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1749
7c5e5e97a3bc move static lexer helper functions to lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16111 diff changeset	1750 int c = curr_lexer->text_yyinput ();
4248 eef64f3f9a4c [project @ 2002-12-31 00:00:20 by jwe] jwe parents: 4241 diff changeset	1751
16294 0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1752 if (c == 1)
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1753 return -1;
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1754 else if (c == EOF)
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1755 return curr_lexer->handle_end_of_input ();
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	1756 else
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	1757 {
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1758 std::ostringstream buf;
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1759
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1760 buf << "invalid character '"
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1761 << undo_string_escape (static_cast<char> (c))
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1762 << "' (ASCII " << c << ")";
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1763
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1764 octave::token *tok
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1765 = new octave::token (LEXICAL_ERROR, buf.str (),
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1766 curr_lexer->input_line_number,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23061 diff changeset	1767 curr_lexer->current_input_column);
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1768
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1769 curr_lexer->push_token (tok);
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1770
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16106 diff changeset	1771 curr_lexer->current_input_column++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1772
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	1773 return curr_lexer->count_token_internal (LEXICAL_ERROR);
4240 8627d992beb8 [project @ 2002-12-25 23:07:03 by jwe] jwe parents: 4238 diff changeset	1774 }
2066 a75d2a5d6783 [project @ 1996-04-11 21:20:43 by jwe] jwe parents: 2042 diff changeset	1775 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1776
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1777 %{
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1778 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1779 // Disable this warning for code that is generated by flex.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1780 #pragma GCC diagnostic push
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1781 #pragma GCC diagnostic ignored "-Wold-style-cast"
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1782 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1783 %}
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1784
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1785 %{
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1786 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1787 // Also disable this warning for functions that is generated by flex
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1788 // after the pattern rules.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1789 #pragma GCC diagnostic ignored "-Wunused-parameter"
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1790 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1791 %}
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1792
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1793 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1794
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1795 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1796 // Restore prevailing warning state for remainder of the file.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1797 #pragma GCC diagnostic pop
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1798 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 20957 diff changeset	1799
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1800 void *
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1801 octave_alloc (yy_size_t size, yyscan_t)
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1802 {
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21912 diff changeset	1803 return std::malloc (size);
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1804 }
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1805
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1806 void *
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1807 octave_realloc (void *ptr, yy_size_t size, yyscan_t)
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1808 {
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21912 diff changeset	1809 return std::realloc (ptr, size);
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1810 }
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1811
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1812 void
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1813 octave_free (void *ptr, yyscan_t)
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1814 {
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21912 diff changeset	1815 std::free (ptr);
19784 a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1816 }
a3577622952c avoid some GCC unused parameter warnings John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1817
8447 adab48231a03 make input_line_number work again John W. Eaton <jwe@octave.org> parents: 8312 diff changeset	1818 static void
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1819 display_character (char c)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1820 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1821 if (isgraph (c))
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1822 std::cerr << c;
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1823 else
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1824 switch (c)
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1825 {
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1826 case 0:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1827 std::cerr << "NUL";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1828 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1829
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1830 case 1:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1831 std::cerr << "SOH";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1832 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1833
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1834 case 2:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1835 std::cerr << "STX";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1836 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1837
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1838 case 3:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1839 std::cerr << "ETX";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1840 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1841
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1842 case 4:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1843 std::cerr << "EOT";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1844 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1845
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1846 case 5:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1847 std::cerr << "ENQ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1848 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1849
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1850 case 6:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1851 std::cerr << "ACK";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1852 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1853
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1854 case 7:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1855 std::cerr << "\\a";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1856 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1857
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1858 case 8:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1859 std::cerr << "\\b";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1860 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1861
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1862 case 9:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1863 std::cerr << "\\t";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1864 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1865
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1866 case 10:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1867 std::cerr << "\\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1868 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1869
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1870 case 11:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1871 std::cerr << "\\v";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1872 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1873
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1874 case 12:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1875 std::cerr << "\\f";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1876 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1877
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1878 case 13:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1879 std::cerr << "\\r";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1880 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1881
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1882 case 14:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1883 std::cerr << "SO";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1884 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1885
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1886 case 15:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1887 std::cerr << "SI";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1888 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1889
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1890 case 16:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1891 std::cerr << "DLE";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1892 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1893
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1894 case 17:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1895 std::cerr << "DC1";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1896 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1897
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1898 case 18:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1899 std::cerr << "DC2";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1900 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1901
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1902 case 19:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1903 std::cerr << "DC3";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1904 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1905
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1906 case 20:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1907 std::cerr << "DC4";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1908 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1909
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1910 case 21:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1911 std::cerr << "NAK";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1912 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1913
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1914 case 22:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1915 std::cerr << "SYN";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1916 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1917
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1918 case 23:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1919 std::cerr << "ETB";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1920 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1921
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1922 case 24:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1923 std::cerr << "CAN";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1924 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1925
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1926 case 25:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1927 std::cerr << "EM";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1928 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1929
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1930 case 26:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1931 std::cerr << "SUB";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1932 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1933
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1934 case 27:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1935 std::cerr << "ESC";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1936 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1937
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1938 case 28:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1939 std::cerr << "FS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1940 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1941
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1942 case 29:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1943 std::cerr << "GS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1944 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1945
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1946 case 30:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1947 std::cerr << "RS";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1948 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1949
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1950 case 31:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1951 std::cerr << "US";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1952 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1953
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1954 case 32:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1955 std::cerr << "SPACE";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1956 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1957
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1958 case 127:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1959 std::cerr << "DEL";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	1960 break;
8535 75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1961 }
75e6ab186761 lexer debugging functions John W. Eaton <jwe@octave.org> parents: 8504 diff changeset	1962 }
8745 6dc61981d18b better handling of object indexing in lexer John W. Eaton <jwe@octave.org> parents: 8701 diff changeset	1963
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1964 namespace octave
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1965 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1966 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1967 is_keyword (const std::string& s)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1968 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1969 // Parsing function names like "set.property_name" inside
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1970 // classdef-style class definitions is simplified by handling the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1971 // "set" and "get" portions of the names using the same mechanism
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1972 // as is used for keywords. However, they are not really keywords
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1973 // in the language, so omit them from the list of possible
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1974 // keywords. Likewise for "enumeration", "events", "methods", and
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1975 // "properties".
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1976
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1977 return (octave_kw_hash::in_word_set (s.c_str (), s.length ()) != 0
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1978 && ! (s == "set" \|\| s == "get"
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1979 \|\| s == "enumeration" \|\| s == "events"
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1980 \|\| s == "methods" \|\| s == "properties"));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1981 }
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1982 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1983
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1984 DEFUN (iskeyword, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1985 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1986 @deftypefn {} {} iskeyword ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1987 @deftypefnx {} {} iskeyword (@var{name})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1988 Return true if @var{name} is an Octave keyword.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1989
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1990 If @var{name} is omitted, return a list of keywords.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1991 @seealso{isvarname, exist}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1992 @end deftypefn */)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1993 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1994 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	1995
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1996 int nargin = args.length ();
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1997
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	1998 if (nargin > 1)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20773 diff changeset	1999 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20773 diff changeset	2000
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2001 if (nargin == 0)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2002 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2003 // Neither set nor get are keywords. See the note in the
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2004 // is_keyword function for additional details.
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2005
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2006 string_vector lst (TOTAL_KEYWORDS);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2007
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2008 int j = 0;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2009
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2010 for (int i = 0; i < TOTAL_KEYWORDS; i++)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2011 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2012 std::string kword = wordlist[i].name;
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2013
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2014 if (kword != "set" && kword != "get")
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2015 lst[j++] = kword;
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2016 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2017
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2018 lst.resize (j);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2019
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2020 retval = Cell (lst.sort ());
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2021 }
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2022 else
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2023 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2024 std::string name = args(0).xstring_value ("iskeyword: NAME must be a string");
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2025 retval = octave::is_keyword (name);
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2026 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2027
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2028 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2029 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2030
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2031 /*
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2032
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2033 %!assert (iskeyword ("for"))
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2034 %!assert (iskeyword ("fort"), false)
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2035 %!assert (iskeyword ("fft"), false)
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2036 %!assert (iskeyword ("get"), false)
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2037 %!assert (iskeyword ("set"), false)
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2038
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2039 %!error iskeyword ("A", "B")
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20798 diff changeset	2040 %!error <NAME must be a string> iskeyword (1)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2041
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2042 */
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2043
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2044 DEFUN (__display_tokens__, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2045 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2046 @deftypefn {} {} __display_tokens__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2047 Query or set the internal variable that determines whether Octave's
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2048 lexer displays tokens as they are read.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2049 @seealso{__lexer_debug_flag__, __token_count__}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2050 @end deftypefn */)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2051 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2052 return SET_INTERNAL_VARIABLE (display_tokens);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2053 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2054
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2055 DEFUN (__token_count__, , ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2056 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2057 @deftypefn {} {} __token_count__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2058 Return the number of language tokens processed since Octave startup.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2059 @seealso{__lexer_debug_flag__, __display_tokens__}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2060 @end deftypefn */)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2061 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2062 return octave_value (Vtoken_count);
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2063 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2064
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2065 DEFUN (__lexer_debug_flag__, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2066 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2067 @deftypefn {} {@var{val} =} __lexer_debug_flag__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2068 @deftypefnx {} {@var{old_val} =} __lexer_debug_flag__ (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2069 Query or set the internal flag that determines whether Octave's lexer prints
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2070 debug information as it processes an expression.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2071 @seealso{__display_tokens__, __token_count__, __parse_debug_flag__}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2072 @end deftypefn */)
16114 73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2073 {
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2074 octave_value retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2075
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2076 retval = set_internal_variable (lexer_debug_flag, args, nargout,
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2077 "__lexer_debug_flag__");
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2078
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2079 return retval;
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2080 }
73a21ade0b6b * lex.ll: Reorder function definitions. John W. Eaton <jwe@octave.org> parents: 16113 diff changeset	2081
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2082 namespace octave
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16253 diff changeset	2083 {
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2084 void
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2085 lexical_feedback::symbol_table_context::clear (void)
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2086 {
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2087 while (! frame_stack.empty ())
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2088 {
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2089 symbol_table::scope *scope = curr_scope ();
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2090
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2091 delete scope;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2092
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2093 frame_stack.pop_front ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2094 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2095 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2096
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2097 void
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2098 lexical_feedback::symbol_table_context::pop (void)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2099 {
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2100 if (empty ())
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2101 panic_impossible ();
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2102
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2103 frame_stack.pop_front ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2104 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2105
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2106 symbol_table::scope *
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2107 lexical_feedback::symbol_table_context::curr_scope (void) const
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2108 {
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2109 if (empty ())
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2110 {
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	2111 symbol_table::scope *scope
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	2112 = __get_current_scope__ ("lexical_feedback::symbol_table_context::curr_scope");
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	2113
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	2114 return scope;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2115 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2116 else
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2117 return frame_stack.front ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2118 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2119
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2120 symbol_table::scope *
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2121 lexical_feedback::symbol_table_context::parent_scope (void) const
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2122 {
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2123 size_t sz = size ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2124
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2125 return sz > 1 ? frame_stack[1] : (sz == 1 ? frame_stack[0] : 0);
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2126 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23555 diff changeset	2127
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2128 lexical_feedback::~lexical_feedback (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2129 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2130 tokens.clear ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2131 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2132
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2133 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2134 lexical_feedback::init (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2135 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2136 // The closest paren, brace, or bracket nesting is not an object
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2137 // index.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2138 looking_at_object_index.push_front (false);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2139 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2140
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2141 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2142 lexical_feedback::reset (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2143 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2144 end_of_input = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2145 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2146 looking_at_anon_fcn_args = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2147 looking_at_return_list = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2148 looking_at_parameter_list = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2149 looking_at_decl_list = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2150 looking_at_initializer_expression = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2151 looking_at_matrix_or_assign_lhs = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2152 looking_for_object_index = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2153 looking_at_indirect_ref = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2154 parsing_class_method = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2155 parsing_classdef = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2156 maybe_classdef_get_set_method = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2157 parsing_classdef_get_method = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2158 parsing_classdef_set_method = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2159 quote_is_transpose = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2160 force_script = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2161 reading_fcn_file = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2162 reading_script_file = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2163 reading_classdef_file = false;
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	2164 buffer_function_text = false;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2165 input_line_number = 1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2166 current_input_column = 1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2167 bracketflag = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2168 braceflag = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2169 looping = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2170 defining_func = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2171 looking_at_function_handle = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2172 block_comment_nesting_level = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2173 command_arg_paren_count = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2174 token_count = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2175 current_input_line = "";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2176 comment_text = "";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2177 help_text = "";
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	2178 function_text = "";
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2179 string_text = "";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2180 string_line = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2181 string_column = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2182 fcn_file_name = "";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2183 fcn_file_full_name = "";
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2184 dir_name = "";
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2185 package_name = "";
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2186 looking_at_object_index.clear ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2187 looking_at_object_index.push_front (false);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2188
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2189 while (! parsed_function_name.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2190 parsed_function_name.pop ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2191
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2192 pending_local_variables.clear ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2193 symtab_context.clear ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2194 nesting_level.reset ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2195 tokens.clear ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2196 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2197
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2198 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2199 lexical_feedback::previous_token_value (void) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2200 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2201 const token *tok = tokens.front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2202 return tok ? tok->token_value () : 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2203 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2204
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2205 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2206 lexical_feedback::previous_token_value_is (int tok_val) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2207 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2208 const token *tok = tokens.front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2209 return tok ? tok->token_value_is (tok_val) : false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2210 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2211
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2212 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2213 lexical_feedback::mark_previous_token_trailing_space (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2214 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2215 token *tok = tokens.front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2216 if (tok && ! previous_token_value_is ('\n'))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2217 tok->mark_trailing_space ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2218 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2219
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2220 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2221 lexical_feedback::space_follows_previous_token (void) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2222 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2223 const token *tok = tokens.front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2224 return tok ? tok->space_follows_token () : false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2225 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2226
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2227 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2228 lexical_feedback::previous_token_is_binop (void) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2229 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2230 int tok = previous_token_value ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2231
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2232 return (tok == '+' \|\| tok == '-' \|\| tok == '@'
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2233 \|\| tok == ',' \|\| tok == ';' \|\| tok == '*' \|\| tok == '/'
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2234 \|\| tok == ':' \|\| tok == '=' \|\| tok == ADD_EQ
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2235 \|\| tok == AND_EQ \|\| tok == DIV_EQ \|\| tok == EDIV
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2236 \|\| tok == EDIV_EQ \|\| tok == ELEFTDIV \|\| tok == ELEFTDIV_EQ
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2237 \|\| tok == EMINUS \|\| tok == EMUL \|\| tok == EMUL_EQ
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2238 \|\| tok == EPOW \|\| tok == EPOW_EQ \|\| tok == EXPR_AND
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2239 \|\| tok == EXPR_AND_AND \|\| tok == EXPR_EQ \|\| tok == EXPR_GE
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2240 \|\| tok == EXPR_GT \|\| tok == EXPR_LE \|\| tok == EXPR_LT
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2241 \|\| tok == EXPR_NE \|\| tok == EXPR_NOT \|\| tok == EXPR_OR
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2242 \|\| tok == EXPR_OR_OR \|\| tok == LEFTDIV \|\| tok == LEFTDIV_EQ
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2243 \|\| tok == MUL_EQ \|\| tok == OR_EQ \|\| tok == POW
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2244 \|\| tok == POW_EQ \|\| tok == SUB_EQ);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2245 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2246
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2247 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2248 lexical_feedback::previous_token_is_keyword (void) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2249 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2250 const token *tok = tokens.front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2251 return tok ? tok->is_keyword () : false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2252 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2253
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2254 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2255 lexical_feedback::previous_token_may_be_command (void) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2256 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2257 const token *tok = tokens.front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2258 return tok ? tok->may_be_command () : false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2259 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2260
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2261 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2262 lexical_feedback::maybe_mark_previous_token_as_variable (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2263 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2264 token *tok = tokens.front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2265
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2266 if (tok && tok->is_symbol ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2267 pending_local_variables.insert (tok->symbol_name ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2268 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2269
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2270 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2271 lexical_feedback::mark_as_variables (const std::list<std::string>& lst)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2272 {
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22857 diff changeset	2273 for (const auto& var : lst)
551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22857 diff changeset	2274 pending_local_variables.insert (var);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2275 }
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2276 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16337 diff changeset	2277
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2278 static bool
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2279 looks_like_copyright (const std::string& s)
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2280 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2281 bool retval = false;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2282
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2283 if (! s.empty ())
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2284 {
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2285 size_t offset = s.find_first_not_of (" \t");
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2286
23555 9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2287 retval = (s.substr (offset, 9) == "Copyright"
9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2288 \|\| s.substr (offset, 6) == "Author");
16228 e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2289 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2290
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2291 return retval;
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2292 }
e19b1632d7c1 revamp most comment handling John W. Eaton <jwe@octave.org> parents: 16224 diff changeset	2293
23555 9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2294 static bool
9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2295 looks_like_shebang (const std::string& s)
9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2296 {
9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2297 return ((! s.empty ()) && (s[0] == '!'));
9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2298 }
9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2299
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2300 namespace octave
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2301 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2302 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2303 base_lexer::input_buffer::fill (const std::string& input, bool eof_arg)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2304 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2305 buffer = input;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2306 chars_left = buffer.length ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2307 pos = buffer.c_str ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2308 eof = eof_arg;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2309 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2310
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2311 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2312 base_lexer::input_buffer::copy_chunk (char *buf, size_t max_size)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2313 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2314 static const char * const eol = "\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2315
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2316 size_t len = max_size > chars_left ? chars_left : max_size;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2317 assert (len > 0);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2318
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2319 memcpy (buf, pos, len);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2320
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2321 chars_left -= len;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2322 pos += len;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2323
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2324 // Make sure input ends with a new line character.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2325 if (chars_left == 0 && buf[len-1] != '\n')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2326 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2327 if (len < max_size)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2328 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2329 // There is enough room to plug the newline character in
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2330 // the buffer.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2331 buf[len++] = '\n';
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2332 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2333 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2334 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2335 // There isn't enough room to plug the newline character
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2336 // in the buffer so arrange to have it returned on the next
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2337 // call to base_lexer::read.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2338 pos = eol;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2339 chars_left = 1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2340 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2341 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2342
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2343 return len;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2344 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2345
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2346 base_lexer::~base_lexer (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2347 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2348 yylex_destroy (scanner);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2349 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2350
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2351 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2352 base_lexer::init (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2353 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2354 yylex_init (&scanner);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2355
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2356 // Make base_lexer object available through yyextra in
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2357 // flex-generated lexer.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2358 yyset_extra (this, scanner);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2359
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2360 clear_start_state ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2361 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2362
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2363 // Inside Flex-generated functions, yyg is the scanner cast to its real
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2364 // type. Some flex macros that we use in base_lexer member functions
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2365 // (for example, BEGIN) use yyg. If we could perform the actions of
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2366 // these macros with functions instead, we could eliminate the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2367 // OCTAVE_YYG macro.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2368
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2369 #define OCTAVE_YYG \
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2370 struct yyguts_t yyg = static_cast<struct yyguts_t> (scanner)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2371
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2372 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2373 base_lexer::reset (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2374 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2375 // Start off on the right foot.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2376 clear_start_state ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2377
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2378 symtab_context.clear ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2379
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2380 // We do want a prompt by default.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2381 promptflag (1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2382
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2383 // Only ask for input from stdin if we are expecting interactive
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2384 // input.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2385
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	2386 if (application::interactive ()
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2387 && ! (reading_fcn_file
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2388 \|\| reading_classdef_file
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2389 \|\| reading_script_file
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2390 \|\| input_from_eval_string ()))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2391 yyrestart (stdin, scanner);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2392
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2393 lexical_feedback::reset ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2394
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2395 comment_buf.reset ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2396 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2397
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2398 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2399 base_lexer::prep_for_file (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2400 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2401 reading_script_file = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2402
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2403 push_start_state (INPUT_FILE_START);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2404 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2405
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2406 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2407 base_lexer::begin_string (int state)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2408 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2409 string_line = input_line_number;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2410 string_column = current_input_column;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2411
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2412 push_start_state (state);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2413 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2414
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2415 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2416 base_lexer::handle_end_of_input (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2417 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2418 lexer_debug ("<<EOF>>");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2419
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2420 if (block_comment_nesting_level != 0)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2421 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2422 warning ("block comment open at end of input");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2423
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2424 if ((reading_fcn_file \|\| reading_script_file \|\| reading_classdef_file)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2425 && ! fcn_file_name.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2426 warning ("near line %d of file '%s.m'",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2427 input_line_number, fcn_file_name.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2428 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2429
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2430 return handle_token (END_OF_INPUT);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2431 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2432
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2433 char *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2434 base_lexer::flex_yytext (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2435 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2436 return yyget_text (scanner);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2437 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2438
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2439 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2440 base_lexer::flex_yyleng (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2441 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2442 return yyget_leng (scanner);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2443 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2444
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2445 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2446 base_lexer::text_yyinput (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2447 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2448 int c = yyinput (scanner);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2449
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2450 if (lexer_debug_flag)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2451 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2452 std::cerr << "I: ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2453 display_character (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2454 std::cerr << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2455 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2456
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2457 // Convert CRLF into just LF and single CR into LF.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2458
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2459 if (c == '\r')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2460 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2461 c = yyinput (scanner);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2462
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2463 if (lexer_debug_flag)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2464 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2465 std::cerr << "I: ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2466 display_character (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2467 std::cerr << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2468 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2469
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2470 if (c != '\n')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2471 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2472 xunput (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2473 c = '\n';
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2474 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2475 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2476
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2477 return c;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2478 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2479
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2480 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2481 base_lexer::xunput (char c, char *buf)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2482 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2483 if (c != EOF)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2484 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2485 if (lexer_debug_flag)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2486 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2487 std::cerr << "U: ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2488 display_character (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2489 std::cerr << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2490 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2491
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2492 yyunput (c, buf, scanner);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2493 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2494 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2495
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2496 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2497 base_lexer::xunput (char c)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2498 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2499 char *yytxt = flex_yytext ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2500
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2501 xunput (c, yytxt);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2502 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2503
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2504 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2505 base_lexer::looking_at_space (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2506 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2507 int c = text_yyinput ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2508 xunput (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2509 return (c == ' ' \|\| c == '\t');
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2510 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2511
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2512 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2513 base_lexer::inside_any_object_index (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2514 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2515 bool retval = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2516
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22857 diff changeset	2517 for (const bool is_obj_idx : looking_at_object_index)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2518 {
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22857 diff changeset	2519 if (is_obj_idx)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2520 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2521 retval = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2522 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2523 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2524 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2525
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2526 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2527 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2528
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2529 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2530 base_lexer::is_variable (const std::string& name,
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2531 symbol_table::scope *scope)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2532 {
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2533 return ((scope && scope->is_variable (name))
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2534 \|\| (pending_local_variables.find (name)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2535 != pending_local_variables.end ()));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2536 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2537
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2538 // Handle keywords. Return -1 if the keyword should be ignored.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2539
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2540 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2541 base_lexer::is_keyword_token (const std::string& s)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2542 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2543 int l = input_line_number;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2544 int c = current_input_column;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2545
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2546 int len = s.length ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2547
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2548 const octave_kw *kw = octave_kw_hash::in_word_set (s.c_str (), len);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2549
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2550 if (kw)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2551 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2552 bool previous_at_bos = at_beginning_of_statement;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2553
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2554 // May be reset to true for some token types.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2555 at_beginning_of_statement = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2556
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2557 token *tok_val = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2558
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2559 switch (kw->kw_id)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2560 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2561 case break_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2562 case catch_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2563 case continue_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2564 case else_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2565 case otherwise_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2566 case return_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2567 case unwind_protect_cleanup_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2568 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2569 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2570
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2571 case persistent_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2572 case global_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2573 looking_at_decl_list = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2574 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2575
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2576 case case_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2577 case elseif_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2578 case until_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2579 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2580
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2581 case end_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2582 if (inside_any_object_index ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2583 \|\| (defining_func
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2584 && ! (looking_at_return_list
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2585 \|\| parsed_function_name.top ())))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2586 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2587 at_beginning_of_statement = previous_at_bos;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2588 return 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2589 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2590
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2591 tok_val = new token (end_kw, token::simple_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2592 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2593 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2594
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2595 case end_try_catch_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2596 tok_val = new token (end_try_catch_kw, token::try_catch_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2597 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2598 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2599
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2600 case end_unwind_protect_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2601 tok_val = new token (end_unwind_protect_kw,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2602 token::unwind_protect_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2603 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2604 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2605
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2606 case endfor_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2607 tok_val = new token (endfor_kw, token::for_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2608 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2609 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2610
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2611 case endfunction_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2612 tok_val = new token (endfunction_kw, token::function_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2613 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2614 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2615
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2616 case endif_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2617 tok_val = new token (endif_kw, token::if_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2618 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2619 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2620
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2621 case endparfor_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2622 tok_val = new token (endparfor_kw, token::parfor_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2623 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2624 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2625
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2626 case endswitch_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2627 tok_val = new token (endswitch_kw, token::switch_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2628 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2629 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2630
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2631 case endwhile_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2632 tok_val = new token (endwhile_kw, token::while_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2633 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2634 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2635
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2636 case endclassdef_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2637 tok_val = new token (endclassdef_kw, token::classdef_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2638 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2639 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2640
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2641 case endenumeration_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2642 tok_val = new token (endenumeration_kw, token::enumeration_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2643 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2644 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2645
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2646 case endevents_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2647 tok_val = new token (endevents_kw, token::events_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2648 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2649 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2650
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2651 case endmethods_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2652 tok_val = new token (endmethods_kw, token::methods_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2653 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2654 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2655
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2656 case endproperties_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2657 tok_val = new token (endproperties_kw, token::properties_end, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2658 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2659 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2660
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2661
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2662 case for_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2663 case parfor_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2664 case while_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2665 decrement_promptflag ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2666 looping++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2667 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2668
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2669 case do_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2670 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2671 decrement_promptflag ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2672 looping++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2673 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2674
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2675 case try_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2676 case unwind_protect_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2677 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2678 decrement_promptflag ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2679 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2680
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2681 case if_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2682 case switch_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2683 decrement_promptflag ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2684 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2685
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2686 case get_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2687 case set_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2688 // 'get' and 'set' are keywords in classdef method
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2689 // declarations.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2690 if (! maybe_classdef_get_set_method)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2691 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2692 at_beginning_of_statement = previous_at_bos;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2693 return 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2694 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2695 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2696
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2697 case enumeration_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2698 case events_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2699 case methods_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2700 case properties_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2701 // 'properties', 'methods' and 'events' are keywords for
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2702 // classdef blocks.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2703 if (! parsing_classdef)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2704 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2705 at_beginning_of_statement = previous_at_bos;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2706 return 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2707 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2708 // fall through ...
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2709
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2710 case classdef_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2711 // 'classdef' is always a keyword.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2712 decrement_promptflag ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2713
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2714 if (! force_script && token_count == 0 && input_from_file ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2715 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2716 reading_classdef_file = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2717 reading_script_file = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2718 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2719 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2720
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2721 case function_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2722 decrement_promptflag ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2723
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2724 defining_func++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2725 parsed_function_name.push (false);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2726
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2727 if (! force_script && token_count == 0 && input_from_file ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2728 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2729 reading_fcn_file = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2730 reading_script_file = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2731 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2732
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2733 if (! (reading_fcn_file \|\| reading_script_file
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2734 \|\| reading_classdef_file))
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	2735 {
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	2736 // Input must be coming from the terminal or stdin?
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	2737 buffer_function_text = true;
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	2738 function_text += (current_input_line + "\n");
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	2739
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	2740 input_line_number = 1;
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	2741 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2742 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2743
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2744 case magic_file_kw:
18319 f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2745 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2746 if ((reading_fcn_file \|\| reading_script_file
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2747 \|\| reading_classdef_file)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2748 && ! fcn_file_full_name.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2749 tok_val = new token (magic_file_kw, fcn_file_full_name, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2750 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2751 tok_val = new token (magic_file_kw, "stdin", l, c);
18319 f59459404f55 allow "methods ftp" to work outside of classdef (bug #41227) John W. Eaton <jwe@octave.org> parents: 18311 diff changeset	2752 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2753 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2754
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2755 case magic_line_kw:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2756 tok_val = new token (magic_line_kw, static_cast<double> (l),
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2757 "", l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2758 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2759
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2760 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2761 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2762 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2763
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2764 if (! tok_val)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2765 tok_val = new token (kw->tok, true, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2766
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2767 push_token (tok_val);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2768
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2769 return kw->tok;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2770 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2771
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2772 return 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2773 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2774
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2775 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2776 base_lexer::fq_identifier_contains_keyword (const std::string& s)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2777 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2778 size_t p1 = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2779 size_t p2;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2780
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2781 std::string s_part;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2782
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2783 do
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2784 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2785 p2 = s.find ('.', p1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2786
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2787 if (p2 != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2788 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2789 s_part = s.substr (p1, p2 - p1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2790 p1 = p2 + 1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10182 diff changeset	2791 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2792 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2793 s_part = s.substr (p1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2794
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2795 if (is_keyword_token (s_part))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2796 return true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2797 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2798 while (p2 != std::string::npos);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2799
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2800 return false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2801 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2802
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2803 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2804 base_lexer::whitespace_is_significant (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2805 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2806 return (nesting_level.is_bracket ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2807 \|\| (nesting_level.is_brace ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2808 && ! looking_at_object_index.front ()));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2809 }
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2810 }
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	2811
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2812 static inline bool
20589 7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2813 looks_like_bin (const char *s, int len)
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2814 {
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2815 return (len > 2 && s[0] == '0' && (s[1] == 'b' \|\| s[1] == 'B'));
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2816 }
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2817
7c0e10f035bd Extend parser to accept binary constants that begin with '0b' or '0B'. Rik <rik@octave.org> parents: 20588 diff changeset	2818 static inline bool
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2819 looks_like_hex (const char *s, int len)
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2820 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2821 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	2822 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3208 diff changeset	2823
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2824 namespace octave
4037 7e0c73f17a5d [project @ 2002-08-13 02:02:26 by jwe] jwe parents: 4018 diff changeset	2825 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2826 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2827 base_lexer::handle_number (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2828 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2829 double value = 0.0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2830 int nread = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2831
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2832 char *yytxt = flex_yytext ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2833
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2834 // Strip any underscores
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2835 char *tmptxt = strsave (yytxt);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2836 char *rptr = tmptxt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2837 char *wptr = tmptxt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2838 while (*rptr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2839 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2840 wptr = rptr++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2841 wptr += (*wptr != '_');
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2842 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2843 *wptr = '\0';
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2844
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2845 if (looks_like_hex (tmptxt, strlen (tmptxt)))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2846 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2847 uintmax_t long_int_value;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2848
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2849 nread = sscanf (tmptxt, "%jx", &long_int_value);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2850
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2851 value = static_cast<double> (long_int_value);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2852 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2853 else if (looks_like_bin (tmptxt, strlen (tmptxt)))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2854 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2855 uintmax_t long_int_value = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2856
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2857 for (size_t i = 0; i < strlen (tmptxt); i++)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2858 {
23211 08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2859 if (tmptxt[i] == '0')
08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2860 long_int_value <<= 1;
08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2861 else if (tmptxt[i] == '1')
08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2862 {
08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2863 long_int_value <<= 1;
08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2864 long_int_value += 1;
08042580fe93 Fix incorrect handling of 0b binary numbers in complex contstants. Rik <rik@octave.org> parents: 22505 diff changeset	2865 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2866 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2867
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2868 value = static_cast<double> (long_int_value);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2869
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2870 nread = 1; // Just to pass the assert stmt below
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2871 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2872 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2873 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2874 char *idx = strpbrk (tmptxt, "Dd");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2875
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2876 if (idx)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2877 *idx = 'e';
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2878
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2879 nread = sscanf (tmptxt, "%lf", &value);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2880 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2881
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2882 delete [] tmptxt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2883
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2884 // If yytext doesn't contain a valid number, we are in deep doo doo.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2885
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2886 assert (nread == 1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2887
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2888 looking_for_object_index = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2889 at_beginning_of_statement = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2890
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2891 push_token (new token (NUM, value, yytxt, input_line_number,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2892 current_input_column));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2893
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2894 current_input_column += flex_yyleng ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2895 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2896
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2897 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2898 base_lexer::handle_continuation (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2899 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2900 char *yytxt = flex_yytext ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2901 int yylng = flex_yyleng ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2902
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2903 int offset = 1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2904 if (yytxt[0] == '\\')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2905 warn_language_extension_continuation ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2906 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2907 offset = 3;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2908
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2909 bool have_space = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2910 while (offset < yylng)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2911 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2912 char c = yytxt[offset];
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2913 if (c == ' ' \|\| c == '\t')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2914 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2915 have_space = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2916 offset++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2917 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2918 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2919 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2920 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2921
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2922 if (have_space)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2923 mark_previous_token_trailing_space ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2924
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2925 bool have_comment = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2926 while (offset < yylng)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2927 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2928 char c = yytxt[offset];
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2929 if (c == '#' \|\| c == '%')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2930 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2931 have_comment = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2932 offset++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2933 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2934 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2935 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2936 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2937
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2938 if (have_comment)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2939 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2940 comment_text = &yytxt[offset];
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2941
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2942 // finish_comment sets at_beginning_of_statement to true but
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2943 // that's not be correct if we are handling a continued
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2944 // statement. Preserve the current state.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2945
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2946 bool saved_bos = at_beginning_of_statement;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2947
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2948 finish_comment (octave_comment_elt::end_of_line);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2949
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2950 at_beginning_of_statement = saved_bos;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2951 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2952
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2953 decrement_promptflag ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2954 input_line_number++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2955 current_input_column = 1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2956 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2957
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2958 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2959 base_lexer::finish_comment (octave_comment_elt::comment_type typ)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2960 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2961 bool copyright = looks_like_copyright (comment_text);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2962
23555 9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2963 if (nesting_level.none () && help_text.empty () && ! comment_text.empty ()
9151922777e2 Pick correct help text when shebang is present (bug #51191). Rik <rik@octave.org> parents: 23479 diff changeset	2964 && ! copyright && ! looks_like_shebang (comment_text))
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2965 help_text = comment_text;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2966
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2967 if (copyright)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2968 typ = octave_comment_elt::copyright;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2969
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2970 comment_buf.append (comment_text, typ);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2971
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2972 comment_text = "";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2973
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2974 at_beginning_of_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2975 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2976
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2977 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2978 base_lexer::handle_close_bracket (int bracket_type)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2979 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2980 int retval = bracket_type;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2981
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2982 if (! nesting_level.none ())
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	2983 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2984 nesting_level.remove ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2985
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2986 if (bracket_type == ']')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2987 bracketflag--;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2988 else if (bracket_type == '}')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2989 braceflag--;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2990 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2991 panic_impossible ();
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	2992 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2993
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2994 pop_start_state ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2995
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2996 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2997 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2998
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2999 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3000 base_lexer::looks_like_command_arg (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3001 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3002 bool space_before = space_follows_previous_token ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3003 bool space_after = looking_at_space ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3004
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3005 return (space_before && ! space_after
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3006 && previous_token_may_be_command ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3007 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3008
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3009 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3010 base_lexer::handle_superclass_identifier (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3011 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3012 std::string meth = flex_yytext ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3013
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3014 size_t pos = meth.find ("@");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3015 std::string cls = meth.substr (pos + 1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3016 meth = meth.substr (0, pos);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3017
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3018 bool kw_token = (is_keyword_token (meth)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3019 \|\| fq_identifier_contains_keyword (cls));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3020
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3021 if (kw_token)
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3022 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3023 token *tok
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3024 = new token (LEXICAL_ERROR,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3025 "method, class, and package names may not be keywords",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3026 input_line_number, current_input_column);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3027
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3028 push_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3029
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3030 return count_token_internal (LEXICAL_ERROR);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3031 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3032
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3033 push_token (new token (SUPERCLASSREF, meth, cls,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3034 input_line_number, current_input_column));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3035
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3036 current_input_column += flex_yyleng ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3037
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3038 return SUPERCLASSREF;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3039 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3040
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3041 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3042 base_lexer::handle_meta_identifier (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3043 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3044 std::string cls = std::string(flex_yytext ()).substr (1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3045
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3046 if (fq_identifier_contains_keyword (cls))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3047 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3048 token *tok = new token (LEXICAL_ERROR,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3049 "class and package names may not be keywords",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3050 input_line_number, current_input_column);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3051 push_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3052
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3053 return count_token_internal (LEXICAL_ERROR);
16126 5c885c13bfa3 localize use of yylval.tok_val in lexical_feedback member functions John W. Eaton <jwe@octave.org> parents: 16125 diff changeset	3054 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3055
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3056 push_token (new token (METAQUERY, cls, input_line_number,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3057 current_input_column));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3058
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3059 current_input_column += flex_yyleng ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3060
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3061 return METAQUERY;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3062 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3063
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3064 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3065 base_lexer::handle_fq_identifier (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3066 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3067 std::string fq_id = flex_yytext ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3068
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3069 if (fq_identifier_contains_keyword (fq_id))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3070 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3071 token *tok
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3072 = new token (LEXICAL_ERROR,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3073 "function, method, class, and package names may not be keywords",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3074 input_line_number, current_input_column);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3075
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3076 push_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3077
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3078 return count_token_internal (LEXICAL_ERROR);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3079 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3080
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3081 push_token (new token (FQ_IDENT, fq_id, input_line_number,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3082 current_input_column));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3083
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3084 current_input_column += flex_yyleng ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3085
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3086 return FQ_IDENT;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3087 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3088
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3089 // Figure out exactly what kind of token to return when we have seen
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3090 // an identifier. Handles keywords. Return -1 if the identifier
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3091 // should be ignored.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3092
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3093 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3094 base_lexer::handle_identifier (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3095 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3096 std::string ident = flex_yytext ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3097
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3098 // If we are expecting a structure element, avoid recognizing
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3099 // keywords and other special names and return STRUCT_ELT, which is
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3100 // a string that is also a valid identifier.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3101
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3102 if (looking_at_indirect_ref)
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3103 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3104 push_token (new token (STRUCT_ELT, ident, input_line_number,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3105 current_input_column));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3106
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3107 looking_for_object_index = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3108
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3109 current_input_column += flex_yyleng ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3110
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3111 return STRUCT_ELT;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3112 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3113
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3114 // If ident is a keyword token, then is_keyword_token will set
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3115 // at_beginning_of_statement. For example, if tok is an IF
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3116 // token, then at_beginning_of_statement will be false.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3117
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3118 int kw_token = is_keyword_token (ident);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3119
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3120 if (looking_at_function_handle)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3121 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3122 if (kw_token)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3123 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3124 token *tok
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3125 = new token (LEXICAL_ERROR,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3126 "function handles may not refer to keywords",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3127 input_line_number, current_input_column);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3128
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3129 push_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3130
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3131 return count_token_internal (LEXICAL_ERROR);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3132 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3133 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3134 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3135 push_token (new token (FCN_HANDLE, ident, input_line_number,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3136 current_input_column));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3137
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3138 current_input_column += flex_yyleng ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3139 looking_for_object_index = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3140
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3141 at_beginning_of_statement = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3142
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3143 return FCN_HANDLE;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3144 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3145 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3146
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3147 // If we have a regular keyword, return it.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3148 // Keywords can be followed by identifiers.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3149
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3150 if (kw_token)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3151 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3152 if (kw_token >= 0)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3153 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3154 current_input_column += flex_yyleng ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3155 looking_for_object_index = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3156 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3157
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3158 // The call to is_keyword_token set at_beginning_of_statement.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3159
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3160 return kw_token;
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3161 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3162
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3163 // Find the token in the symbol table.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3164
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3165 symbol_table::scope *scope = symtab_context.curr_scope ();
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3166
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3167 symbol_table::symbol_record sr
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3168 = (scope
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3169 ? scope->insert (ident)
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3170 : symbol_table::symbol_record (scope, ident));
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3171
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3172 token *tok = new token (NAME, sr, input_line_number, current_input_column);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3173
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3174 // The following symbols are handled specially so that things like
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3175 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3176 // pi +1
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3177 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3178 // are parsed as an addition expression instead of as a command-style
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3179 // function call with the argument "+1".
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3180
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3181 if (at_beginning_of_statement
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3182 && (! (is_variable (ident, scope)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3183 \|\| ident == "e" \|\| ident == "pi"
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3184 \|\| ident == "I" \|\| ident == "i"
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3185 \|\| ident == "J" \|\| ident == "j"
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3186 \|\| ident == "Inf" \|\| ident == "inf"
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3187 \|\| ident == "NaN" \|\| ident == "nan")))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3188 tok->mark_may_be_command ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3189
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3190 push_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3191
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3192 current_input_column += flex_yyleng ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3193
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3194 // The magic end index can't be indexed.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3195
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3196 if (ident != "end")
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3197 looking_for_object_index = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3198
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3199 at_beginning_of_statement = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3200
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3201 return NAME;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3202 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3203
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3204 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3205 base_lexer::maybe_warn_separator_insert (char sep)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3206 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3207 std::string nm = fcn_file_full_name;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3208
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3209 if (nm.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3210 warning_with_id ("Octave:separator-insert",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3211 "potential auto-insertion of '%c' near line %d",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3212 sep, input_line_number);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3213 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3214 warning_with_id ("Octave:separator-insert",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3215 "potential auto-insertion of '%c' near line %d of file %s",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3216 sep, input_line_number, nm.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3217 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3218
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3219 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3220 base_lexer::warn_single_quote_string (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3221 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3222 std::string nm = fcn_file_full_name;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3223
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3224 if (nm.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3225 warning_with_id ("Octave:single-quote-string",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3226 "single quote delimited string near line %d",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3227 input_line_number);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3228 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3229 warning_with_id ("Octave:single-quote-string",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3230 "single quote delimited string near line %d of file %s",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3231 input_line_number, nm.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3232 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3233
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3234 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3235 base_lexer::warn_language_extension (const std::string& msg)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3236 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3237 std::string nm = fcn_file_full_name;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3238
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3239 if (nm.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3240 warning_with_id ("Octave:language-extension",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3241 "Octave language extension used: %s",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3242 msg.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3243 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3244 warning_with_id ("Octave:language-extension",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3245 "Octave language extension used: %s near line %d offile %s",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3246 msg.c_str (), input_line_number, nm.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3247 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3248
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3249 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3250 base_lexer::maybe_warn_language_extension_comment (char c)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3251 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3252 if (c == '#')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3253 warn_language_extension ("# used as comment character");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3254 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3255
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3256 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3257 base_lexer::warn_language_extension_continuation (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3258 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3259 warn_language_extension ("\\ used as line continuation marker");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3260 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3261
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3262 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3263 base_lexer::warn_language_extension_operator (const std::string& op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3264 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3265 std::string t = op;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3266 int n = t.length ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3267 if (t[n-1] == '\n')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3268 t.resize (n-1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3269 warn_language_extension (t + " used as operator");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3270 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3271
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3272 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3273 base_lexer::push_token (token *tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3274 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3275 YYSTYPE *lval = yyget_lval (scanner);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3276 lval->tok_val = tok;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3277 tokens.push (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3278 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3279
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3280 token *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3281 base_lexer::current_token (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3282 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3283 YYSTYPE *lval = yyget_lval (scanner);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3284 return lval->tok_val;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3285 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3286
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3287 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3288 base_lexer::display_token (int tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3289 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3290 switch (tok)
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3291 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3292 case '=': std::cerr << "'='\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3293 case ':': std::cerr << "':'\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3294 case '-': std::cerr << "'-'\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3295 case '+': std::cerr << "'+'\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3296 case '': std::cerr << "''\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3297 case '/': std::cerr << "'/'\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3298 case ADD_EQ: std::cerr << "ADD_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3299 case SUB_EQ: std::cerr << "SUB_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3300 case MUL_EQ: std::cerr << "MUL_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3301 case DIV_EQ: std::cerr << "DIV_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3302 case LEFTDIV_EQ: std::cerr << "LEFTDIV_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3303 case POW_EQ: std::cerr << "POW_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3304 case EMUL_EQ: std::cerr << "EMUL_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3305 case EDIV_EQ: std::cerr << "EDIV_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3306 case ELEFTDIV_EQ: std::cerr << "ELEFTDIV_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3307 case EPOW_EQ: std::cerr << "EPOW_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3308 case AND_EQ: std::cerr << "AND_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3309 case OR_EQ: std::cerr << "OR_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3310 case EXPR_AND_AND: std::cerr << "EXPR_AND_AND\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3311 case EXPR_OR_OR: std::cerr << "EXPR_OR_OR\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3312 case EXPR_AND: std::cerr << "EXPR_AND\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3313 case EXPR_OR: std::cerr << "EXPR_OR\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3314 case EXPR_NOT: std::cerr << "EXPR_NOT\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3315 case EXPR_LT: std::cerr << "EXPR_LT\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3316 case EXPR_LE: std::cerr << "EXPR_LE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3317 case EXPR_EQ: std::cerr << "EXPR_EQ\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3318 case EXPR_NE: std::cerr << "EXPR_NE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3319 case EXPR_GE: std::cerr << "EXPR_GE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3320 case EXPR_GT: std::cerr << "EXPR_GT\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3321 case LEFTDIV: std::cerr << "LEFTDIV\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3322 case EMUL: std::cerr << "EMUL\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3323 case EDIV: std::cerr << "EDIV\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3324 case ELEFTDIV: std::cerr << "ELEFTDIV\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3325 case EPLUS: std::cerr << "EPLUS\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3326 case EMINUS: std::cerr << "EMINUS\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3327 case HERMITIAN: std::cerr << "HERMITIAN\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3328 case TRANSPOSE: std::cerr << "TRANSPOSE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3329 case PLUS_PLUS: std::cerr << "PLUS_PLUS\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3330 case MINUS_MINUS: std::cerr << "MINUS_MINUS\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3331 case POW: std::cerr << "POW\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3332 case EPOW: std::cerr << "EPOW\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3333
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3334 case NUM:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3335 case IMAG_NUM:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3336 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3337 token *tok_val = current_token ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3338 std::cerr << (tok == NUM ? "NUM" : "IMAG_NUM")
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3339 << " [" << tok_val->number () << "]\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3340 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3341 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3342
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3343 case STRUCT_ELT:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3344 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3345 token *tok_val = current_token ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3346 std::cerr << "STRUCT_ELT [" << tok_val->text () << "]\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3347 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3348 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3349
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3350 case NAME:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3351 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3352 token *tok_val = current_token ();
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3353 symbol_table::symbol_record sr = tok_val->sym_rec ();
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3354 std::cerr << "NAME [" << sr.name () << "]\n";
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3355 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3356 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3357
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3358 case END: std::cerr << "END\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3359
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3360 case DQ_STRING:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3361 case SQ_STRING:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3362 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3363 token *tok_val = current_token ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3364
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3365 std::cerr << (tok == DQ_STRING ? "DQ_STRING" : "SQ_STRING")
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3366 << " [" << tok_val->text () << "]\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3367 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3368 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3369
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3370 case FOR: std::cerr << "FOR\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3371 case WHILE: std::cerr << "WHILE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3372 case DO: std::cerr << "DO\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3373 case UNTIL: std::cerr << "UNTIL\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3374 case IF: std::cerr << "IF\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3375 case ELSEIF: std::cerr << "ELSEIF\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3376 case ELSE: std::cerr << "ELSE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3377 case SWITCH: std::cerr << "SWITCH\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3378 case CASE: std::cerr << "CASE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3379 case OTHERWISE: std::cerr << "OTHERWISE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3380 case BREAK: std::cerr << "BREAK\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3381 case CONTINUE: std::cerr << "CONTINUE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3382 case FUNC_RET: std::cerr << "FUNC_RET\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3383 case UNWIND: std::cerr << "UNWIND\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3384 case CLEANUP: std::cerr << "CLEANUP\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3385 case TRY: std::cerr << "TRY\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3386 case CATCH: std::cerr << "CATCH\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3387 case GLOBAL: std::cerr << "GLOBAL\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3388 case PERSISTENT: std::cerr << "PERSISTENT\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3389 case FCN_HANDLE: std::cerr << "FCN_HANDLE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3390 case END_OF_INPUT: std::cerr << "END_OF_INPUT\n\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3391 case LEXICAL_ERROR: std::cerr << "LEXICAL_ERROR\n\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3392 case FCN: std::cerr << "FCN\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3393 case INPUT_FILE: std::cerr << "INPUT_FILE\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3394 case SUPERCLASSREF: std::cerr << "SUPERCLASSREF\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3395 case METAQUERY: std::cerr << "METAQUERY\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3396 case GET: std::cerr << "GET\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3397 case SET: std::cerr << "SET\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3398 case PROPERTIES: std::cerr << "PROPERTIES\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3399 case METHODS: std::cerr << "METHODS\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3400 case EVENTS: std::cerr << "EVENTS\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3401 case CLASSDEF: std::cerr << "CLASSDEF\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3402 case '\n': std::cerr << "\\n\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3403 case '\r': std::cerr << "\\r\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3404 case '\t': std::cerr << "TAB\n"; break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3405 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3406 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3407 if (tok < 256 && tok > 31)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3408 std::cerr << static_cast<char> (tok) << "\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3409 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3410 std::cerr << "UNKNOWN(" << tok << ")\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3411 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3412 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3413 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3414 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3415
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3416 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3417 base_lexer::fatal_error (const char *msg)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3418 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3419 error ("fatal lexer error: %s", msg);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3420 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3421
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3422 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3423 base_lexer::lexer_debug (const char *pattern)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3424 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3425 if (lexer_debug_flag)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3426 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3427 std::cerr << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3428
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3429 display_start_state ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3430
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3431 std::cerr << "P: " << pattern << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3432 std::cerr << "T: " << flex_yytext () << std::endl;
16119 b31eb56f4d84 maint: reorder class definitions in lex.ll John W. Eaton <jwe@octave.org> parents: 16118 diff changeset	3433 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3434 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3435
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3436 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3437 base_lexer::push_start_state (int state)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3438 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3439 OCTAVE_YYG;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3440
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3441 start_state_stack.push (state);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3442
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3443 BEGIN (start_state ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3444 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3445
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3446 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3447 base_lexer::pop_start_state (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3448 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3449 OCTAVE_YYG;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3450
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3451 start_state_stack.pop ();
4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3452
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3453 BEGIN (start_state ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3454 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3455
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3456 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3457 base_lexer::clear_start_state (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3458 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3459 while (! start_state_stack.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3460 start_state_stack.pop ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3461
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3462 push_start_state (INITIAL);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3463 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3464
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3465 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3466 base_lexer::display_start_state (void) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3467 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3468 std::cerr << "S: ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3469
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3470 switch (start_state ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3471 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3472 case INITIAL:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3473 std::cerr << "INITIAL" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3474 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3475
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3476 case COMMAND_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3477 std::cerr << "COMMAND_START" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3478 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3479
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3480 case MATRIX_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3481 std::cerr << "MATRIX_START" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3482 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3483
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3484 case INPUT_FILE_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3485 std::cerr << "INPUT_FILE_BEGIN" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3486 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3487
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3488 case BLOCK_COMMENT_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3489 std::cerr << "BLOCK_COMMENT_START" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3490 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3491
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3492 case LINE_COMMENT_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3493 std::cerr << "LINE_COMMENT_START" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3494 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3495
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3496 case DQ_STRING_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3497 std::cerr << "DQ_STRING_START" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3498 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3499
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3500 case SQ_STRING_START:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3501 std::cerr << "SQ_STRING_START" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3502 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3503
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3504 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3505 std::cerr << "UNKNOWN START STATE!" << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3506 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3507 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3508 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3509
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3510 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3511 base_lexer::handle_op (const char *pattern, int tok, bool bos)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3512 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3513 lexer_debug (pattern);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3514
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3515 return handle_op_internal (tok, bos, true);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3516 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3517
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3518 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3519 base_lexer::handle_language_extension_op (const char *pattern, int tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3520 bool bos)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3521 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3522 lexer_debug (pattern);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3523
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3524 return handle_op_internal (tok, bos, false);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3525 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3526
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3527 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3528 base_lexer::maybe_unput_comma_before_unary_op (int tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3529 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3530 int prev_tok = previous_token_value ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3531
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3532 bool unput_comma = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3533
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3534 if (whitespace_is_significant () && space_follows_previous_token ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3535 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3536 int c = text_yyinput ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3537 xunput (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3538
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3539 bool space_after = (c == ' ' \|\| c == '\t');
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3540
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3541 if (! (prev_tok == '[' \|\| prev_tok == '{'
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3542 \|\| previous_token_is_binop ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3543 \|\| ((tok == '+' \|\| tok == '-') && space_after)))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3544 unput_comma = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3545 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3546
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3547 return unput_comma;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3548 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3549
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3550 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3551 base_lexer::handle_unary_op (int tok, bool bos)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3552 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3553 return maybe_unput_comma_before_unary_op (tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3554 ? -1 : handle_op_internal (tok, bos, true);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3555 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3556
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3557 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3558 base_lexer::handle_language_extension_unary_op (int tok, bool bos)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3559 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3560 return maybe_unput_comma_before_unary_op (tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3561 ? -1 : handle_op_internal (tok, bos, false);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3562 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3563
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3564 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3565 base_lexer::handle_op_internal (int tok, bool bos, bool compat)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3566 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3567 if (! compat)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3568 warn_language_extension_operator (flex_yytext ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3569
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3570 push_token (new token (tok, input_line_number, current_input_column));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3571
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3572 current_input_column += flex_yyleng ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3573 looking_for_object_index = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3574 at_beginning_of_statement = bos;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3575
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3576 return count_token_internal (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3577 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3578
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3579 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3580 base_lexer::handle_token (const std::string& name, int tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3581 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3582 token *tok_val = new token (tok, name, input_line_number,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3583 current_input_column);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3584
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3585 return handle_token (tok, tok_val);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3586 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3587
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3588 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3589 base_lexer::handle_token (int tok, token *tok_val)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3590 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3591 if (! tok_val)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3592 tok_val = new token (tok, input_line_number, current_input_column);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3593
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3594 push_token (tok_val);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3595
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3596 current_input_column += flex_yyleng ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3597
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3598 return count_token_internal (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3599 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3600
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3601 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3602 base_lexer::count_token (int tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3603 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3604 token *tok_val = new token (tok, input_line_number, current_input_column);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3605
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3606 push_token (tok_val);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3607
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3608 return count_token_internal (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3609 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3610
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3611 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3612 base_lexer::count_token_internal (int tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3613 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3614 if (tok != '\n')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3615 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3616 Vtoken_count++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3617 token_count++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3618 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3619
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3620 return show_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3621 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3622
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3623 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3624 base_lexer::show_token (int tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3625 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3626 if (Vdisplay_tokens)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3627 display_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3628
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3629 if (lexer_debug_flag)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3630 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3631 std::cerr << "R: ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3632 display_token (tok);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3633 std::cerr << std::endl;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3634 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3635
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3636 return tok;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3637 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3638
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3639 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3640 base_lexer::enable_fq_identifier (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3641 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3642 push_start_state (FQ_IDENT_START);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3643 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3644
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3645 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3646 lexer::fill_flex_buffer (char *buf, unsigned max_size)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3647 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3648 int status = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3649
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3650 if (input_buf.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3651 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3652 bool eof = false;
23061 aedc662896a3 move input reader classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	3653 current_input_line = reader.get_input (eof);
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3654
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3655 input_buf.fill (current_input_line, eof);
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3656
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3657 // Attempt to capture text for functions defined on the
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3658 // command line.
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3659 //
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3660 // FIXME: the handling of newline here seems a bit clumsy.
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3661 //
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3662 // See also comments in push_lexer::append_input.
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3663
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3664 if (buffer_function_text)
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3665 {
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3666 function_text += current_input_line;
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3667 if (current_input_line[current_input_line.length () - 1] != '\n')
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3668 function_text += "\n";
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3669 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3670 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3671
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3672 if (! input_buf.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3673 status = input_buf.copy_chunk (buf, max_size);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3674 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3675 status = YY_NULL;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3676
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3677 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3678 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3679
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3680 void
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3681 push_lexer::append_input (const std::string& input, bool eof)
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3682 {
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3683 // FIXME: input may contain more than one line, so how can we
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3684 // properly start buffering input for command-line functions?
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3685 //
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3686 // Currently, base_lexer::is_keyword_token starts buffering text
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3687 // for command-line functions by setting the initial value of
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3688 // function_text to current_input_line when function_kw is
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3689 // recognized. To make that work, we need to do something like
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3690 // maintain a queue of input strings and pass them to the flex
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3691 // buffer one line at a time, while also setting
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3692 // current_input_line. Some care will be needed if a single line
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3693 // of input arrives in multiple calls to append_input.
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3694
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3695 input_buf.fill (input, eof);
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3696 }
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	3697
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3698 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3699 push_lexer::fill_flex_buffer (char *buf, unsigned max_size)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3700 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3701 int status = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3702
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3703 if (input_buf.empty () && ! input_buf.at_eof ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3704 input_buf.fill (std::string (1, static_cast<char> (1)), false);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3705
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3706 if (! input_buf.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3707 status = input_buf.copy_chunk (buf, max_size);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3708 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3709 status = YY_NULL;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3710
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3711 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3712 }
16224 4a848eb52de2 use stack for tracking lexer start states John W. Eaton <jwe@octave.org> parents: 16209 diff changeset	3713 }

Mercurial > octave

annotate libinterp/parse-tree/lex.ll @ 23730:85f1d31956c0