Mercurial > octave-nkf
annotate src/lex.ll @ 9794:0d4613a736e9
convert build system to use automake and libtool
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 10 Nov 2009 15:02:25 -0500 |
| parents | src/lex.l@d9b25c5b8ee5 |
| children | 7ad32bf759c3 |
| rev | line source |
|---|---|
| 1994 | 1 /* |
| 1 | 2 |
| 7017 | 3 Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
| 8920 | 4 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
| 5 John W. Eaton | |
| 1 | 6 |
| 7 This file is part of Octave. | |
| 8 | |
| 9 Octave is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 7016 | 11 Free Software Foundation; either version 3 of the License, or (at your |
| 12 option) any later version. | |
| 1 | 13 |
| 14 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 7016 | 20 along with Octave; see the file COPYING. If not, see |
| 21 <http://www.gnu.org/licenses/>. | |
| 1 | 22 |
| 23 */ | |
| 24 | |
| 4753 | 25 %option prefix = "octave_" |
| 26 | |
| 4208 | 27 %s COMMAND_START |
| 28 %s MATRIX_START | |
| 4240 | 29 |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
30 %x SCRIPT_FILE_BEGIN |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
31 %x FUNCTION_FILE_BEGIN |
| 1 | 32 |
| 33 %{ | |
| 240 | 34 #ifdef HAVE_CONFIG_H |
| 1220 | 35 #include <config.h> |
| 240 | 36 #endif |
| 37 | |
| 1341 | 38 #include <cctype> |
| 39 #include <cstring> | |
| 40 | |
|
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
41 #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
|
42 #include <set> |
| 5765 | 43 #include <sstream> |
| 1823 | 44 #include <string> |
| 4214 | 45 #include <stack> |
| 1823 | 46 |
| 4093 | 47 #ifdef HAVE_UNISTD_H |
| 48 #ifdef HAVE_SYS_TYPES_H | |
| 49 #include <sys/types.h> | |
| 50 #endif | |
| 51 #include <unistd.h> | |
| 52 #endif | |
| 53 | |
| 2926 | 54 #include "cmd-edit.h" |
| 4153 | 55 #include "quit.h" |
| 4910 | 56 #include "lo-mappers.h" |
| 2926 | 57 |
| 1497 | 58 // These would be alphabetical, but y.tab.h must be included before |
| 59 // oct-gperf.h and y.tab.h must be included after token.h and the tree | |
| 60 // class declarations. We can't include y.tab.h in oct-gperf.h | |
| 61 // because it may not be protected to allow it to be included multiple | |
| 62 // times. | |
| 63 | |
| 4264 | 64 #include "Cell.h" |
| 3665 | 65 #include "comment-list.h" |
| 2181 | 66 #include "defun.h" |
| 1355 | 67 #include "error.h" |
| 4910 | 68 #include "gripes.h" |
| 1351 | 69 #include "input.h" |
| 1355 | 70 #include "lex.h" |
| 2891 | 71 #include "ov.h" |
| 1355 | 72 #include "parse.h" |
| 2987 | 73 #include "pt-all.h" |
| 2891 | 74 #include "symtab.h" |
| 75 #include "token.h" | |
| 76 #include "toplev.h" | |
| 1355 | 77 #include "utils.h" |
| 78 #include "variables.h" | |
|
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9476
diff
changeset
|
79 #include <oct-parse.h> |
| 2492 | 80 #include <oct-gperf.h> |
| 1 | 81 |
| 2716 | 82 #if ! (defined (FLEX_SCANNER) \ |
| 83 && defined (YY_FLEX_MAJOR_VERSION) && YY_FLEX_MAJOR_VERSION >= 2 \ | |
| 84 && defined (YY_FLEX_MINOR_VERSION) && YY_FLEX_MINOR_VERSION >= 5) | |
| 85 #error lex.l requires flex version 2.5.4 or later | |
| 86 #endif | |
| 87 | |
| 4753 | 88 #define yylval octave_lval |
| 89 | |
| 90 // Arrange to get input via readline. | |
| 91 | |
| 92 #ifdef YY_INPUT | |
| 93 #undef YY_INPUT | |
| 94 #endif | |
| 95 #define YY_INPUT(buf, result, max_size) \ | |
| 96 if ((result = octave_read (buf, max_size)) < 0) \ | |
| 97 YY_FATAL_ERROR ("octave_read () in flex scanner failed"); | |
| 98 | |
| 99 // Try to avoid crashing out completely on fatal scanner errors. | |
| 100 // The call to yy_fatal_error should never happen, but it avoids a | |
| 101 // `static function defined but not used' warning from gcc. | |
| 102 | |
| 103 #ifdef YY_FATAL_ERROR | |
| 104 #undef YY_FATAL_ERROR | |
| 105 #endif | |
| 106 #define YY_FATAL_ERROR(msg) \ | |
| 107 do \ | |
| 108 { \ | |
| 109 error (msg); \ | |
| 110 OCTAVE_QUIT; \ | |
| 111 yy_fatal_error (msg); \ | |
| 112 } \ | |
| 113 while (0) | |
| 114 | |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
115 #define DISPLAY_TOK_AND_RETURN(tok) \ |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
116 do \ |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
117 { \ |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
118 int tok_val = tok; \ |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
119 if (Vdisplay_tokens) \ |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
120 display_token (tok_val); \ |
| 8535 | 121 if (lexer_debug_flag) \ |
| 122 { \ | |
| 123 std::cerr << "R: "; \ | |
| 124 display_token (tok_val); \ | |
| 125 std::cerr << std::endl; \ | |
| 126 } \ | |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
127 return tok_val; \ |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
128 } \ |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
129 while (0) |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
130 |
| 4910 | 131 #define COUNT_TOK_AND_RETURN(tok) \ |
| 132 do \ | |
| 133 { \ | |
| 134 Vtoken_count++; \ | |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
135 DISPLAY_TOK_AND_RETURN (tok); \ |
| 4910 | 136 } \ |
| 137 while (0) | |
| 138 | |
| 4753 | 139 #define TOK_RETURN(tok) \ |
| 140 do \ | |
| 141 { \ | |
| 142 current_input_column += yyleng; \ | |
| 143 lexer_flags.quote_is_transpose = false; \ | |
| 144 lexer_flags.convert_spaces_to_comma = true; \ | |
| 4910 | 145 COUNT_TOK_AND_RETURN (tok); \ |
| 4753 | 146 } \ |
| 147 while (0) | |
| 148 | |
| 149 #define TOK_PUSH_AND_RETURN(name, tok) \ | |
| 150 do \ | |
| 151 { \ | |
| 152 yylval.tok_val = new token (name, input_line_number, \ | |
| 153 current_input_column); \ | |
| 154 token_stack.push (yylval.tok_val); \ | |
| 155 TOK_RETURN (tok); \ | |
| 156 } \ | |
| 157 while (0) | |
| 158 | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
159 #define BIN_OP_RETURN(tok, convert, bos) \ |
| 4753 | 160 do \ |
| 161 { \ | |
| 162 yylval.tok_val = new token (input_line_number, current_input_column); \ | |
| 163 token_stack.push (yylval.tok_val); \ | |
| 164 current_input_column += yyleng; \ | |
| 165 lexer_flags.quote_is_transpose = false; \ | |
| 166 lexer_flags.convert_spaces_to_comma = convert; \ | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
167 lexer_flags.looking_for_object_index = false; \ |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
168 lexer_flags.at_beginning_of_statement = bos; \ |
| 4910 | 169 COUNT_TOK_AND_RETURN (tok); \ |
| 4753 | 170 } \ |
| 171 while (0) | |
| 172 | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
173 #define XBIN_OP_RETURN(tok, convert, bos) \ |
| 4753 | 174 do \ |
| 175 { \ | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
176 gripe_matlab_incompatible_operator (yytext); \ |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
177 BIN_OP_RETURN (tok, convert, bos); \ |
| 4753 | 178 } \ |
| 179 while (0) | |
| 180 | |
| 8535 | 181 #define LEXER_DEBUG(pattern) \ |
| 182 do \ | |
| 183 { \ | |
| 184 if (lexer_debug_flag) \ | |
| 185 lexer_debug (pattern, yytext); \ | |
| 186 } \ | |
| 187 while (0) | |
| 188 | |
| 3883 | 189 // TRUE means that we have encountered EOF on the input stream. |
| 190 bool parser_end_of_input = false; | |
| 191 | |
| 1826 | 192 // Flags that need to be shared between the lexer and parser. |
| 193 lexical_feedback lexer_flags; | |
| 194 | |
| 1351 | 195 // Stack to hold tokens so that we can delete them when the parser is |
| 196 // reset and avoid growing forever just because we are stashing some | |
| 197 // information. This has to appear before lex.h is included, because | |
| 198 // one of the macros defined there uses token_stack. | |
| 2614 | 199 // |
| 5775 | 200 // FIXME -- this should really be static, but that causes |
| 2614 | 201 // problems on some systems. |
| 4214 | 202 std::stack <token*> token_stack; |
| 1351 | 203 |
| 1826 | 204 // Did eat_whitespace() eat a space or tab, or a newline, or both? |
| 1 | 205 |
| 1826 | 206 typedef int yum_yum; |
| 1 | 207 |
| 1826 | 208 const yum_yum ATE_NOTHING = 0; |
| 209 const yum_yum ATE_SPACE_OR_TAB = 1; | |
| 210 const yum_yum ATE_NEWLINE = 2; | |
| 1088 | 211 |
| 3351 | 212 // Is the closest nesting level a square bracket, squiggly brace or a paren? |
| 1826 | 213 |
| 4214 | 214 class bracket_brace_paren_nesting_level |
| 1826 | 215 { |
| 216 public: | |
| 217 | |
| 4214 | 218 bracket_brace_paren_nesting_level (void) : context () { } |
| 1826 | 219 |
| 3351 | 220 ~bracket_brace_paren_nesting_level (void) { } |
| 221 | |
| 4214 | 222 void bracket (void) { context.push (BRACKET); } |
| 223 bool is_bracket (void) | |
| 224 { return ! context.empty () && context.top () == BRACKET; } | |
| 225 | |
| 226 void brace (void) { context.push (BRACE); } | |
| 227 bool is_brace (void) | |
| 228 { return ! context.empty () && context.top () == BRACE; } | |
| 229 | |
| 230 void paren (void) { context.push (PAREN); } | |
| 231 bool is_paren (void) | |
| 232 { return ! context.empty () && context.top () == PAREN; } | |
| 233 | |
| 4608 | 234 bool is_bracket_or_brace (void) |
| 235 { return (! context.empty () | |
| 236 && (context.top () == BRACKET || context.top () == BRACE)); } | |
| 237 | |
| 4214 | 238 bool none (void) { return context.empty (); } |
| 239 | |
| 240 void remove (void) { if (! context.empty ()) context.pop (); } | |
| 241 | |
| 242 void clear (void) { while (! context.empty ()) context.pop (); } | |
| 1826 | 243 |
| 244 private: | |
| 245 | |
| 4214 | 246 std::stack<int> context; |
| 247 | |
| 5225 | 248 static const int BRACKET; |
| 249 static const int BRACE; | |
| 250 static const int PAREN; | |
| 1826 | 251 |
| 3351 | 252 bracket_brace_paren_nesting_level (const bracket_brace_paren_nesting_level&); |
| 1826 | 253 |
| 3351 | 254 bracket_brace_paren_nesting_level& |
| 255 operator = (const bracket_brace_paren_nesting_level&); | |
| 1826 | 256 }; |
| 257 | |
| 5225 | 258 const int bracket_brace_paren_nesting_level::BRACKET = 1; |
| 259 const int bracket_brace_paren_nesting_level::BRACE = 2; | |
| 260 const int bracket_brace_paren_nesting_level::PAREN = 3; | |
| 261 | |
| 3351 | 262 static bracket_brace_paren_nesting_level nesting_level; |
| 1 | 263 |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
264 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
|
265 |
| 4910 | 266 static unsigned int Vtoken_count = 0; |
| 267 | |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
268 // The start state that was in effect when the beginning of a block |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
269 // comment was noticed. |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
270 static int block_comment_nesting_level = 0; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
271 |
| 8535 | 272 // Internal variable for lexer debugging state. |
| 273 static bool lexer_debug_flag = false; | |
| 274 | |
| 146 | 275 // Forward declarations for functions defined at the bottom of this |
| 276 // file. | |
| 277 | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
278 static int text_yyinput (void); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
279 static void xunput (char c, char *buf); |
| 1 | 280 static void fixup_column_count (char *s); |
| 146 | 281 static void do_comma_insert_check (void); |
| 4867 | 282 static int is_keyword_token (const std::string& s); |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
283 static int process_comment (bool start_in_block, bool& eof); |
| 2857 | 284 static bool match_any (char c, const char *s); |
| 3263 | 285 static bool next_token_is_sep_op (void); |
| 3246 | 286 static bool next_token_is_bin_op (bool spc_prev); |
| 287 static bool next_token_is_postfix_unary_op (bool spc_prev); | |
| 3523 | 288 static std::string strip_trailing_whitespace (char *s); |
| 3246 | 289 static void handle_number (void); |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
290 static int handle_string (char delim); |
| 4612 | 291 static int handle_close_bracket (bool spc_gobbled, int bracket_type); |
| 9476 | 292 static int handle_superclass_identifier (void); |
| 293 static int handle_meta_identifier (void); | |
| 3974 | 294 static int handle_identifier (void); |
| 3096 | 295 static bool have_continuation (bool trailing_comments_ok = true); |
| 296 static bool have_ellipsis_continuation (bool trailing_comments_ok = true); | |
| 3665 | 297 static void scan_for_comments (const char *); |
| 1826 | 298 static yum_yum eat_whitespace (void); |
| 299 static yum_yum eat_continuation (void); | |
| 3388 | 300 static void maybe_warn_separator_insert (char sep); |
| 3400 | 301 static void gripe_single_quote_string (void); |
| 4037 | 302 static void gripe_matlab_incompatible (const std::string& msg); |
| 303 static void maybe_gripe_matlab_incompatible_comment (char c); | |
| 304 static void gripe_matlab_incompatible_continuation (void); | |
| 305 static void gripe_matlab_incompatible_operator (const std::string& op); | |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
306 static void display_token (int tok); |
| 8535 | 307 static void lexer_debug (const char *pattern, const char *text); |
| 1 | 308 |
| 309 %} | |
| 310 | |
| 311 D [0-9] | |
| 312 S [ \t] | |
| 5570 | 313 NL ((\n)|(\r)|(\r\n)) |
| 2042 | 314 SNL ({S}|{NL}) |
| 1 | 315 EL (\.\.\.) |
| 967 | 316 BS (\\) |
| 317 CONT ({EL}|{BS}) | |
| 1 | 318 Im [iIjJ] |
| 967 | 319 CCHAR [#%] |
| 320 COMMENT ({CCHAR}.*{NL}) | |
| 321 SNLCMT ({SNL}|{COMMENT}) | |
| 322 NOT ((\~)|(\!)) | |
| 4037 | 323 POW ((\*\*)|(\^)) |
| 324 EPOW (\.{POW}) | |
| 5290 | 325 IDENT ([_$a-zA-Z][_$a-zA-Z0-9]*) |
| 1 | 326 EXPON ([DdEe][+-]?{D}+) |
| 3220 | 327 NUMBER (({D}+\.?{D}*{EXPON}?)|(\.{D}+{EXPON}?)|(0[xX][0-9a-fA-F]+)) |
| 1 | 328 %% |
| 329 | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
330 %{ |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
331 // Make script and function files start with a bogus token. This makes |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
332 // the parser go down a special path. |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
333 %} |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
334 |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
335 <SCRIPT_FILE_BEGIN>. { |
| 8535 | 336 LEXER_DEBUG ("<SCRIPT_FILE_BEGIN>."); |
| 337 | |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
338 BEGIN (INITIAL); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
339 xunput (yytext[0], yytext); |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
340 COUNT_TOK_AND_RETURN (SCRIPT_FILE); |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
341 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
342 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
343 <FUNCTION_FILE_BEGIN>. { |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
344 LEXER_DEBUG ("<FUNCTION_FILE_BEGIN>."); |
| 8535 | 345 |
| 4323 | 346 BEGIN (INITIAL); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
347 xunput (yytext[0], yytext); |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
348 COUNT_TOK_AND_RETURN (FUNCTION_FILE); |
| 4238 | 349 } |
| 350 | |
| 968 | 351 %{ |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
352 // Help and other command-style functions. |
| 968 | 353 %} |
| 354 | |
| 4208 | 355 <COMMAND_START>{NL} { |
| 8535 | 356 LEXER_DEBUG ("<COMMAND_START>{NL}"); |
| 357 | |
| 4323 | 358 BEGIN (INITIAL); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
359 input_line_number++; |
| 967 | 360 current_input_column = 1; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
361 |
| 2857 | 362 lexer_flags.quote_is_transpose = false; |
| 363 lexer_flags.convert_spaces_to_comma = true; | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
364 lexer_flags.looking_for_object_index = false; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
365 lexer_flags.at_beginning_of_statement = true; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
366 |
| 4910 | 367 COUNT_TOK_AND_RETURN ('\n'); |
| 967 | 368 } |
| 1 | 369 |
| 4208 | 370 <COMMAND_START>[\;\,] { |
| 8535 | 371 LEXER_DEBUG ("<COMMAND_START>[\\;\\,]"); |
| 372 | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
373 lexer_flags.looking_for_object_index = false; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
374 lexer_flags.at_beginning_of_statement = true; |
| 5102 | 375 |
| 376 BEGIN (INITIAL); | |
| 377 | |
| 378 if (strcmp (yytext, ",") == 0) | |
| 379 TOK_RETURN (','); | |
| 967 | 380 else |
| 5102 | 381 TOK_RETURN (';'); |
| 967 | 382 } |
| 1 | 383 |
| 4208 | 384 <COMMAND_START>[\"\'] { |
| 8535 | 385 LEXER_DEBUG ("<COMMAND_START>[\\\"\\']"); |
| 386 | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
387 lexer_flags.at_beginning_of_statement = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
388 |
| 975 | 389 current_input_column++; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
390 int tok = handle_string (yytext[0]); |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
391 |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
392 COUNT_TOK_AND_RETURN (tok); |
| 975 | 393 } |
| 394 | |
| 4923 | 395 <COMMAND_START>[^#% \t\r\n\;\,\"\'][^ \t\r\n\;\,]*{S}* { |
| 8535 | 396 LEXER_DEBUG ("<COMMAND_START>[^#% \\t\\r\\n\\;\\,\\\"\\'][^ \\t\\r\\n\\;\\,]*{S}*"); |
| 397 | |
| 3523 | 398 std::string tok = strip_trailing_whitespace (yytext); |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
399 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
400 lexer_flags.looking_for_object_index = false; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
401 lexer_flags.at_beginning_of_statement = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
402 |
| 5279 | 403 TOK_PUSH_AND_RETURN (tok, SQ_STRING); |
| 967 | 404 } |
| 1 | 405 |
| 968 | 406 %{ |
| 1 | 407 // For this and the next two rules, we're looking at ']', and we |
| 971 | 408 // need to know if the next token is `=' or `=='. |
| 1 | 409 // |
| 410 // It would have been so much easier if the delimiters were simply | |
| 411 // different for the expression on the left hand side of the equals | |
| 412 // operator. | |
| 971 | 413 // |
| 414 // It's also a pain in the ass to decide whether to insert a comma | |
| 415 // after seeing a ']' character... | |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
416 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
417 // FIXME -- we need to handle block comments here. |
| 968 | 418 %} |
| 419 | |
| 4208 | 420 <MATRIX_START>{SNLCMT}*\]{S}* { |
| 8535 | 421 LEXER_DEBUG ("<MATRIX_START>{SNLCMT}*\\]{S}*"); |
| 422 | |
| 3665 | 423 scan_for_comments (yytext); |
| 1001 | 424 fixup_column_count (yytext); |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
425 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
426 lexer_flags.looking_at_object_index.pop_front (); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
427 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
428 lexer_flags.looking_for_object_index = true; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
429 lexer_flags.at_beginning_of_statement = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
430 |
| 1001 | 431 int c = yytext[yyleng-1]; |
| 432 int cont_is_spc = eat_continuation (); | |
| 4608 | 433 bool spc_gobbled = (cont_is_spc || c == ' ' || c == '\t'); |
| 5345 | 434 int tok_to_return = handle_close_bracket (spc_gobbled, ']'); |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
435 |
| 5345 | 436 if (spc_gobbled) |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
437 xunput (' ', yytext); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
438 |
| 5345 | 439 COUNT_TOK_AND_RETURN (tok_to_return); |
| 4608 | 440 } |
| 441 | |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
442 %{ |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
443 // FIXME -- we need to handle block comments here. |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
444 %} |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
445 |
| 4608 | 446 <MATRIX_START>{SNLCMT}*\}{S}* { |
| 8535 | 447 LEXER_DEBUG ("<MATRIX_START>{SNLCMT}*\\}{S}*"); |
| 448 | |
| 4608 | 449 scan_for_comments (yytext); |
| 450 fixup_column_count (yytext); | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
451 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
452 lexer_flags.looking_at_object_index.pop_front (); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
453 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
454 lexer_flags.looking_for_object_index = true; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
455 lexer_flags.at_beginning_of_statement = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
456 |
| 4608 | 457 int c = yytext[yyleng-1]; |
| 458 int cont_is_spc = eat_continuation (); | |
| 459 bool spc_gobbled = (cont_is_spc || c == ' ' || c == '\t'); | |
| 5345 | 460 int tok_to_return = handle_close_bracket (spc_gobbled, '}'); |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
461 |
| 5345 | 462 if (spc_gobbled) |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
463 xunput (' ', yytext); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
464 |
| 5345 | 465 COUNT_TOK_AND_RETURN (tok_to_return); |
| 967 | 466 } |
| 1 | 467 |
| 968 | 468 %{ |
| 1088 | 469 // Commas are element separators in matrix constants. If we don't |
| 470 // check for continuations here we can end up inserting too many | |
| 471 // commas. | |
| 968 | 472 %} |
| 473 | |
| 4208 | 474 <MATRIX_START>{S}*\,{S}* { |
| 8535 | 475 LEXER_DEBUG ("<MATRIX_START>{S}*\\,{S}*"); |
| 476 | |
| 1088 | 477 current_input_column += yyleng; |
| 3388 | 478 |
| 1088 | 479 int tmp = eat_continuation (); |
| 3388 | 480 |
| 2857 | 481 lexer_flags.quote_is_transpose = false; |
| 482 lexer_flags.convert_spaces_to_comma = true; | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
483 lexer_flags.looking_for_object_index = false; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
484 lexer_flags.at_beginning_of_statement = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
485 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
486 if (! lexer_flags.looking_at_object_index.front ()) |
| 3388 | 487 { |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
488 if ((tmp & ATE_NEWLINE) == ATE_NEWLINE) |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
489 { |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
490 maybe_warn_separator_insert (';'); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
491 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
492 xunput (';', yytext); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
493 } |
| 3388 | 494 } |
| 495 | |
| 4910 | 496 COUNT_TOK_AND_RETURN (','); |
| 967 | 497 } |
| 1 | 498 |
| 968 | 499 %{ |
| 500 // In some cases, spaces in matrix constants can turn into commas. | |
| 501 // If commas are required, spaces are not important in matrix | |
| 1088 | 502 // constants so we just eat them. If we don't check for continuations |
| 503 // here we can end up inserting too many commas. | |
| 968 | 504 %} |
| 430 | 505 |
| 4208 | 506 <MATRIX_START>{S}+ { |
| 8535 | 507 LEXER_DEBUG ("<MATRIX_START>{S}+"); |
| 508 | |
| 1088 | 509 current_input_column += yyleng; |
| 3388 | 510 |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
511 lexer_flags.at_beginning_of_statement = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
512 |
| 3388 | 513 int tmp = eat_continuation (); |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
514 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
515 if (! lexer_flags.looking_at_object_index.front ()) |
| 967 | 516 { |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
517 bool bin_op = next_token_is_bin_op (true); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
518 bool postfix_un_op = next_token_is_postfix_unary_op (true); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
519 bool sep_op = next_token_is_sep_op (); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
520 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
521 if (! (postfix_un_op || bin_op || sep_op) |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
522 && nesting_level.is_bracket_or_brace () |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
523 && lexer_flags.convert_spaces_to_comma) |
| 3388 | 524 { |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
525 if ((tmp & ATE_NEWLINE) == ATE_NEWLINE) |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
526 { |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
527 maybe_warn_separator_insert (';'); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
528 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
529 xunput (';', yytext); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
530 } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
531 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
532 lexer_flags.quote_is_transpose = false; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
533 lexer_flags.convert_spaces_to_comma = true; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
534 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
535 maybe_warn_separator_insert (','); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
536 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
537 COUNT_TOK_AND_RETURN (','); |
| 3388 | 538 } |
| 967 | 539 } |
| 540 } | |
| 430 | 541 |
| 968 | 542 %{ |
| 1088 | 543 // Semicolons are handled as row seprators in matrix constants. If we |
| 544 // don't eat whitespace here we can end up inserting too many | |
| 545 // semicolons. | |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
546 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
547 // FIXME -- we need to handle block comments here. |
| 968 | 548 %} |
| 549 | |
| 4208 | 550 <MATRIX_START>{SNLCMT}*;{SNLCMT}* { |
| 8535 | 551 LEXER_DEBUG ("<MATRIX_START>{SNLCMT}*;{SNLCMT}*"); |
| 552 | |
| 3665 | 553 scan_for_comments (yytext); |
| 967 | 554 fixup_column_count (yytext); |
| 1001 | 555 eat_whitespace (); |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
556 |
| 2857 | 557 lexer_flags.quote_is_transpose = false; |
| 558 lexer_flags.convert_spaces_to_comma = true; | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
559 lexer_flags.looking_for_object_index = false; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
560 lexer_flags.at_beginning_of_statement = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
561 |
| 4910 | 562 COUNT_TOK_AND_RETURN (';'); |
| 967 | 563 } |
| 564 | |
| 968 | 565 %{ |
| 1088 | 566 // In some cases, new lines can also become row separators. If we |
| 567 // don't eat whitespace here we can end up inserting too many | |
| 568 // semicolons. | |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
569 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
570 // FIXME -- we need to handle block comments here. |
| 985 | 571 %} |
| 572 | |
| 4208 | 573 <MATRIX_START>{S}*{COMMENT}{SNLCMT}* | |
| 574 <MATRIX_START>{S}*{NL}{SNLCMT}* { | |
| 8535 | 575 LEXER_DEBUG ("<MATRIX_START>{S}*{COMMENT}{SNLCMT}*|<MATRIX_START>{S}*{NL}{SNLCMT}*"); |
| 576 | |
| 3665 | 577 scan_for_comments (yytext); |
| 1082 | 578 fixup_column_count (yytext); |
| 1088 | 579 eat_whitespace (); |
| 3388 | 580 |
| 4476 | 581 lexer_flags.quote_is_transpose = false; |
| 582 lexer_flags.convert_spaces_to_comma = true; | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
583 lexer_flags.at_beginning_of_statement = false; |
| 4476 | 584 |
| 585 if (nesting_level.none ()) | |
| 586 return LEXICAL_ERROR; | |
| 985 | 587 |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
588 if (! lexer_flags.looking_at_object_index.front () |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
589 && nesting_level.is_bracket_or_brace ()) |
| 3388 | 590 { |
| 591 maybe_warn_separator_insert (';'); | |
| 592 | |
| 4910 | 593 COUNT_TOK_AND_RETURN (';'); |
| 985 | 594 } |
| 595 } | |
| 596 | |
| 967 | 597 \[{S}* { |
| 8535 | 598 LEXER_DEBUG ("\\[{S}*"); |
| 599 | |
| 3351 | 600 nesting_level.bracket (); |
| 975 | 601 |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
602 lexer_flags.looking_at_object_index.push_front (false); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
603 |
| 1082 | 604 current_input_column += yyleng; |
| 2857 | 605 lexer_flags.quote_is_transpose = false; |
| 606 lexer_flags.convert_spaces_to_comma = true; | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
607 lexer_flags.looking_for_object_index = false; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
608 lexer_flags.at_beginning_of_statement = false; |
| 975 | 609 |
| 5615 | 610 if (lexer_flags.defining_func && ! lexer_flags.parsed_function_name) |
| 611 lexer_flags.looking_at_return_list = true; | |
| 612 else | |
| 613 lexer_flags.looking_at_matrix_or_assign_lhs = true; | |
| 614 | |
| 975 | 615 promptflag--; |
| 616 eat_whitespace (); | |
| 617 | |
| 5102 | 618 lexer_flags.bracketflag++; |
| 619 BEGIN (MATRIX_START); | |
| 620 COUNT_TOK_AND_RETURN ('['); | |
| 967 | 621 } |
| 1 | 622 |
| 968 | 623 \] { |
| 8535 | 624 LEXER_DEBUG ("\\]"); |
| 625 | |
| 1826 | 626 nesting_level.remove (); |
| 968 | 627 |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
628 lexer_flags.looking_at_object_index.pop_front (); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
629 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
630 lexer_flags.looking_for_object_index = true; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
631 lexer_flags.at_beginning_of_statement = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
632 |
| 5102 | 633 TOK_RETURN (']'); |
| 968 | 634 } |
| 635 | |
| 636 %{ | |
| 637 // Imaginary numbers. | |
| 638 %} | |
| 639 | |
| 640 {NUMBER}{Im} { | |
| 8535 | 641 LEXER_DEBUG ("{NUMBER}{Im}"); |
| 642 | |
| 3246 | 643 handle_number (); |
| 4910 | 644 COUNT_TOK_AND_RETURN (IMAG_NUM); |
| 968 | 645 } |
| 646 | |
| 647 %{ | |
| 648 // Real numbers. Don't grab the `.' part of a dot operator as part of | |
| 649 // the constant. | |
| 650 %} | |
| 651 | |
| 8535 | 652 {D}+/\.[\*/\\^\'] | |
| 968 | 653 {NUMBER} { |
| 8535 | 654 LEXER_DEBUG ("{D}+/\\.[\\*/\\^\\']|{NUMBER}"); |
| 3246 | 655 handle_number (); |
| 4910 | 656 COUNT_TOK_AND_RETURN (NUM); |
| 968 | 657 } |
| 658 | |
| 659 %{ | |
| 660 // Eat whitespace. Whitespace inside matrix constants is handled by | |
| 4208 | 661 // the <MATRIX_START> start state code above. |
| 968 | 662 %} |
| 663 | |
| 967 | 664 {S}* { |
| 665 current_input_column += yyleng; | |
| 666 } | |
| 667 | |
| 968 | 668 %{ |
| 669 // Continuation lines. Allow comments after continuations. | |
| 670 %} | |
| 671 | |
| 967 | 672 {CONT}{S}*{NL} | |
| 673 {CONT}{S}*{COMMENT} { | |
| 8535 | 674 LEXER_DEBUG ("{CONT}{S}*{NL}|{CONT}{S}*{COMMENT}"); |
| 675 | |
| 4037 | 676 if (yytext[0] == '\\') |
| 677 gripe_matlab_incompatible_continuation (); | |
| 3665 | 678 scan_for_comments (yytext); |
| 967 | 679 promptflag--; |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
680 input_line_number++; |
| 967 | 681 current_input_column = 1; |
| 682 } | |
| 1 | 683 |
| 968 | 684 %{ |
| 685 // End of file. | |
| 686 %} | |
| 687 | |
| 967 | 688 <<EOF>> { |
| 8535 | 689 LEXER_DEBUG ("<<EOF>>"); |
| 690 | |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
691 if (block_comment_nesting_level != 0) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
692 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
693 warning ("block comment open at end of input"); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
694 |
| 9476 | 695 if ((reading_fcn_file || reading_script_file || reading_classdef_file) |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
696 && ! curr_fcn_file_name.empty ()) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
697 warning ("near line %d of file `%s.m'", |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
698 input_line_number, curr_fcn_file_name.c_str ()); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
699 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
700 |
| 967 | 701 TOK_RETURN (END_OF_INPUT); |
| 702 } | |
| 1 | 703 |
| 968 | 704 %{ |
| 970 | 705 // Identifiers. Truncate the token at the first space or tab but |
| 706 // don't write directly on yytext. | |
| 968 | 707 %} |
| 708 | |
| 967 | 709 {IDENT}{S}* { |
| 8535 | 710 LEXER_DEBUG ("{IDENT}{S}*"); |
| 711 | |
| 4238 | 712 int id_tok = handle_identifier (); |
| 713 | |
| 714 if (id_tok >= 0) | |
|
9324
29563379fa9b
don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
715 COUNT_TOK_AND_RETURN (id_tok); |
| 967 | 716 } |
| 1 | 717 |
| 968 | 718 %{ |
| 9476 | 719 // Superclass method identifiers. |
| 720 %} | |
| 721 | |
| 722 {IDENT}@{IDENT}{S}* | | |
| 723 {IDENT}@{IDENT}.{IDENT}{S}* { | |
| 724 LEXER_DEBUG ("{IDENT}@{IDENT}{S}*|{IDENT}@{IDENT}.{IDENT}{S}*"); | |
| 725 | |
| 726 int id_tok = handle_superclass_identifier (); | |
| 727 | |
| 728 if (id_tok >= 0) | |
| 729 { | |
| 730 lexer_flags.looking_for_object_index = true; | |
| 731 | |
| 732 COUNT_TOK_AND_RETURN (SUPERCLASSREF); | |
| 733 } | |
| 734 } | |
| 735 | |
| 736 %{ | |
| 737 // Metaclass query | |
| 738 %} | |
| 739 | |
| 740 \?{IDENT}{S}* | | |
| 741 \?{IDENT}.{IDENT}{S}* { | |
| 742 LEXER_DEBUG ("\?{IDENT}{S}* | \?{IDENT}.{IDENT}{S}*"); | |
| 743 | |
| 744 int id_tok = handle_meta_identifier (); | |
| 745 | |
| 746 if (id_tok >= 0) | |
| 747 { | |
| 748 lexer_flags.looking_for_object_index = true; | |
| 749 | |
| 750 COUNT_TOK_AND_RETURN (METAQUERY); | |
| 751 } | |
| 752 } | |
| 753 | |
| 754 %{ | |
| 755 // Function handles and superclass references | |
| 4342 | 756 %} |
| 757 | |
| 4930 | 758 "@" { |
| 8535 | 759 LEXER_DEBUG ("@"); |
| 760 | |
| 4930 | 761 current_input_column++; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
762 |
| 4930 | 763 lexer_flags.quote_is_transpose = false; |
| 764 lexer_flags.convert_spaces_to_comma = false; | |
| 765 lexer_flags.looking_at_function_handle++; | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
766 lexer_flags.looking_for_object_index = false; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
767 lexer_flags.at_beginning_of_statement = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
768 |
| 4930 | 769 COUNT_TOK_AND_RETURN ('@'); |
| 9476 | 770 |
| 4342 | 771 } |
| 772 | |
| 773 %{ | |
| 968 | 774 // A new line character. New line characters inside matrix constants |
| 4208 | 775 // are handled by the <MATRIX_START> start state code above. If closest |
| 985 | 776 // nesting is inside parentheses, don't return a row separator. |
| 968 | 777 %} |
| 778 | |
| 967 | 779 {NL} { |
| 8535 | 780 LEXER_DEBUG ("{NL}"); |
| 781 | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
782 input_line_number++; |
| 967 | 783 current_input_column = 1; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
784 |
| 2857 | 785 lexer_flags.quote_is_transpose = false; |
| 786 lexer_flags.convert_spaces_to_comma = true; | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
787 |
| 1826 | 788 if (nesting_level.none ()) |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
789 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
790 lexer_flags.at_beginning_of_statement = true; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
791 COUNT_TOK_AND_RETURN ('\n'); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
792 } |
| 4037 | 793 else if (nesting_level.is_paren ()) |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
794 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
795 lexer_flags.at_beginning_of_statement = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
796 gripe_matlab_incompatible ("bare newline inside parentheses"); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
797 } |
| 4608 | 798 else if (nesting_level.is_bracket_or_brace ()) |
| 985 | 799 return LEXICAL_ERROR; |
| 967 | 800 } |
| 1 | 801 |
| 968 | 802 %{ |
| 803 // Single quote can either be the beginning of a string or a transpose | |
| 804 // operator. | |
| 805 %} | |
| 806 | |
| 967 | 807 "'" { |
| 8535 | 808 LEXER_DEBUG ("'"); |
| 809 | |
| 967 | 810 current_input_column++; |
| 2857 | 811 lexer_flags.convert_spaces_to_comma = true; |
| 1 | 812 |
| 1826 | 813 if (lexer_flags.quote_is_transpose) |
| 967 | 814 { |
| 815 do_comma_insert_check (); | |
| 4910 | 816 COUNT_TOK_AND_RETURN (QUOTE); |
| 967 | 817 } |
| 818 else | |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
819 { |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
820 int tok = handle_string ('\''); |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
821 COUNT_TOK_AND_RETURN (tok); |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
822 } |
| 967 | 823 } |
| 1 | 824 |
| 968 | 825 %{ |
| 971 | 826 // Double quotes always begin strings. |
| 827 %} | |
| 828 | |
| 973 | 829 \" { |
| 8535 | 830 LEXER_DEBUG ("\""); |
| 831 | |
| 973 | 832 current_input_column++; |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
833 int tok = handle_string ('"'); |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
834 |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
835 COUNT_TOK_AND_RETURN (tok); |
| 973 | 836 } |
| 971 | 837 |
| 838 %{ | |
|
8536
de1b944d5306
lex.l: finish previous change
John W. Eaton <jwe@octave.org>
parents:
8535
diff
changeset
|
839 // Gobble comments. |
| 985 | 840 %} |
| 968 | 841 |
| 967 | 842 {CCHAR} { |
| 8535 | 843 LEXER_DEBUG ("{CCHAR}"); |
| 844 | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
845 lexer_flags.looking_for_object_index = false; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
846 |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
847 xunput (yytext[0], yytext); |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
848 |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
849 bool eof = false; |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
850 int tok = process_comment (false, eof); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
851 |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
852 if (eof) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
853 TOK_RETURN (END_OF_INPUT); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
854 else if (tok > 0) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
855 COUNT_TOK_AND_RETURN (tok); |
| 967 | 856 } |
| 440 | 857 |
| 968 | 858 %{ |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
859 // Block comments. |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
860 %} |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
861 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
862 ^{S}*{CCHAR}\{{S}*{NL} { |
| 8535 | 863 LEXER_DEBUG ("^{S}*{CCHAR}\\{{S}*{NL}"); |
| 864 | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
865 lexer_flags.looking_for_object_index = false; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
866 |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
867 input_line_number++; |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
868 current_input_column = 1; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
869 block_comment_nesting_level++; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
870 promptflag--; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
871 |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
872 bool eof = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
873 process_comment (true, eof); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
874 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
875 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
876 %{ |
| 968 | 877 // Other operators. |
| 878 %} | |
| 879 | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
880 ":" { LEXER_DEBUG (":"); BIN_OP_RETURN (':', false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
881 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
882 ".+" { LEXER_DEBUG (".+"); XBIN_OP_RETURN (EPLUS, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
883 ".-" { LEXER_DEBUG (".-"); XBIN_OP_RETURN (EMINUS, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
884 ".*" { LEXER_DEBUG (".*"); BIN_OP_RETURN (EMUL, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
885 "./" { LEXER_DEBUG ("./"); BIN_OP_RETURN (EDIV, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
886 ".\\" { LEXER_DEBUG (".\\"); BIN_OP_RETURN (ELEFTDIV, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
887 ".^" { LEXER_DEBUG (".^"); BIN_OP_RETURN (EPOW, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
888 ".**" { LEXER_DEBUG (".**"); XBIN_OP_RETURN (EPOW, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
889 ".'" { LEXER_DEBUG (".'"); do_comma_insert_check (); BIN_OP_RETURN (TRANSPOSE, true, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
890 "++" { LEXER_DEBUG ("++"); do_comma_insert_check (); XBIN_OP_RETURN (PLUS_PLUS, true, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
891 "--" { LEXER_DEBUG ("--"); do_comma_insert_check (); XBIN_OP_RETURN (MINUS_MINUS, true, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
892 "<=" { LEXER_DEBUG ("<="); BIN_OP_RETURN (EXPR_LE, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
893 "==" { LEXER_DEBUG ("=="); BIN_OP_RETURN (EXPR_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
894 "~=" { LEXER_DEBUG ("~="); BIN_OP_RETURN (EXPR_NE, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
895 "!=" { LEXER_DEBUG ("!="); XBIN_OP_RETURN (EXPR_NE, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
896 ">=" { LEXER_DEBUG (">="); BIN_OP_RETURN (EXPR_GE, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
897 "&" { LEXER_DEBUG ("&"); BIN_OP_RETURN (EXPR_AND, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
898 "|" { LEXER_DEBUG ("|"); BIN_OP_RETURN (EXPR_OR, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
899 "<" { LEXER_DEBUG ("<"); BIN_OP_RETURN (EXPR_LT, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
900 ">" { LEXER_DEBUG (">"); BIN_OP_RETURN (EXPR_GT, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
901 "+" { LEXER_DEBUG ("+"); BIN_OP_RETURN ('+', false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
902 "-" { LEXER_DEBUG ("-"); BIN_OP_RETURN ('-', false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
903 "*" { LEXER_DEBUG ("*"); BIN_OP_RETURN ('*', false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
904 "/" { LEXER_DEBUG ("/"); BIN_OP_RETURN ('/', false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
905 "\\" { LEXER_DEBUG ("\\"); BIN_OP_RETURN (LEFTDIV, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
906 ";" { LEXER_DEBUG (";"); BIN_OP_RETURN (';', true, true); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
907 "," { LEXER_DEBUG (","); BIN_OP_RETURN (',', true, ! lexer_flags.looking_at_object_index.front ()); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
908 "^" { LEXER_DEBUG ("^"); BIN_OP_RETURN (POW, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
909 "**" { LEXER_DEBUG ("**"); XBIN_OP_RETURN (POW, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
910 "=" { LEXER_DEBUG ("="); BIN_OP_RETURN ('=', true, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
911 "&&" { LEXER_DEBUG ("&&"); BIN_OP_RETURN (EXPR_AND_AND, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
912 "||" { LEXER_DEBUG ("||"); BIN_OP_RETURN (EXPR_OR_OR, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
913 "<<" { LEXER_DEBUG ("<<"); XBIN_OP_RETURN (LSHIFT, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
914 ">>" { LEXER_DEBUG (">>"); XBIN_OP_RETURN (RSHIFT, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
915 |
| 967 | 916 {NOT} { |
| 8535 | 917 LEXER_DEBUG ("{NOT}"); |
| 918 | |
| 4037 | 919 if (yytext[0] == '~') |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
920 BIN_OP_RETURN (EXPR_NOT, false, false); |
| 4037 | 921 else |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
922 XBIN_OP_RETURN (EXPR_NOT, false, false); |
| 967 | 923 } |
| 1 | 924 |
| 967 | 925 "(" { |
| 8535 | 926 LEXER_DEBUG ("("); |
| 927 | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
928 // If we are looking for an object index, then push TRUE for |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
929 // looking_at_object_index. Otherwise, just push whatever state |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
930 // is current (so that we can pop it off the stack when we find |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
931 // the matching close paren). |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
932 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
933 lexer_flags.looking_at_object_index.push_front |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
934 (lexer_flags.looking_for_object_index); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
935 |
| 4131 | 936 lexer_flags.looking_at_indirect_ref = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
937 lexer_flags.looking_for_object_index = false; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
938 lexer_flags.at_beginning_of_statement = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
939 |
| 1826 | 940 nesting_level.paren (); |
| 985 | 941 promptflag--; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
942 |
| 967 | 943 TOK_RETURN ('('); |
| 944 } | |
| 945 | |
| 946 ")" { | |
| 8535 | 947 LEXER_DEBUG (")"); |
| 948 | |
| 1826 | 949 nesting_level.remove (); |
| 967 | 950 current_input_column++; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
951 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
952 lexer_flags.looking_at_object_index.pop_front (); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
953 |
| 2857 | 954 lexer_flags.quote_is_transpose = true; |
| 4608 | 955 lexer_flags.convert_spaces_to_comma = nesting_level.is_bracket_or_brace (); |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
956 lexer_flags.looking_for_object_index = true; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
957 lexer_flags.at_beginning_of_statement = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
958 |
| 1001 | 959 do_comma_insert_check (); |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
960 |
| 4910 | 961 COUNT_TOK_AND_RETURN (')'); |
| 967 | 962 } |
| 963 | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
964 "." { |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
965 LEXER_DEBUG ("."); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
966 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
967 lexer_flags.looking_for_object_index = false; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
968 lexer_flags.at_beginning_of_statement = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
969 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
970 TOK_RETURN ('.'); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
971 } |
| 8535 | 972 |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
973 "+=" { LEXER_DEBUG ("+="); XBIN_OP_RETURN (ADD_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
974 "-=" { LEXER_DEBUG ("-="); XBIN_OP_RETURN (SUB_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
975 "*=" { LEXER_DEBUG ("*="); XBIN_OP_RETURN (MUL_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
976 "/=" { LEXER_DEBUG ("/="); XBIN_OP_RETURN (DIV_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
977 "\\=" { LEXER_DEBUG ("\\="); XBIN_OP_RETURN (LEFTDIV_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
978 ".+=" { LEXER_DEBUG (".+="); XBIN_OP_RETURN (ADD_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
979 ".-=" { LEXER_DEBUG (".-="); XBIN_OP_RETURN (SUB_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
980 ".*=" { LEXER_DEBUG (".*="); XBIN_OP_RETURN (EMUL_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
981 "./=" { LEXER_DEBUG ("./="); XBIN_OP_RETURN (EDIV_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
982 ".\\=" { LEXER_DEBUG (".\\="); XBIN_OP_RETURN (ELEFTDIV_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
983 {POW}= { LEXER_DEBUG ("{POW}="); XBIN_OP_RETURN (POW_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
984 {EPOW}= { LEXER_DEBUG ("{EPOW}="); XBIN_OP_RETURN (EPOW_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
985 "&=" { LEXER_DEBUG ("&="); XBIN_OP_RETURN (AND_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
986 "|=" { LEXER_DEBUG ("|="); XBIN_OP_RETURN (OR_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
987 "<<=" { LEXER_DEBUG ("<<="); XBIN_OP_RETURN (LSHIFT_EQ, false, false); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
988 ">>=" { LEXER_DEBUG (">>="); XBIN_OP_RETURN (RSHIFT_EQ, false, false); } |
| 2877 | 989 |
| 4608 | 990 \{{S}* { |
| 8535 | 991 LEXER_DEBUG ("\\{{S}*"); |
| 992 | |
| 3351 | 993 nesting_level.brace (); |
| 4608 | 994 |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
995 lexer_flags.looking_at_object_index.push_front |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
996 (lexer_flags.looking_for_object_index); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
997 |
| 4608 | 998 current_input_column += yyleng; |
| 999 lexer_flags.quote_is_transpose = false; | |
| 1000 lexer_flags.convert_spaces_to_comma = true; | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1001 lexer_flags.looking_for_object_index = false; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1002 lexer_flags.at_beginning_of_statement = false; |
| 4608 | 1003 |
| 3351 | 1004 promptflag--; |
| 4608 | 1005 eat_whitespace (); |
| 1006 | |
| 4613 | 1007 lexer_flags.braceflag++; |
| 4608 | 1008 BEGIN (MATRIX_START); |
| 4910 | 1009 COUNT_TOK_AND_RETURN ('{'); |
| 3351 | 1010 } |
| 1011 | |
| 1012 "}" { | |
| 8535 | 1013 LEXER_DEBUG ("}"); |
| 1014 | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1015 lexer_flags.looking_at_object_index.pop_front (); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1016 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1017 lexer_flags.looking_for_object_index = true; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1018 lexer_flags.at_beginning_of_statement = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1019 |
| 3351 | 1020 nesting_level.remove (); |
| 1021 | |
| 4608 | 1022 TOK_RETURN ('}'); |
| 3351 | 1023 } |
| 1024 | |
| 968 | 1025 %{ |
| 2066 | 1026 // Unrecognized input is a lexical error. |
| 968 | 1027 %} |
| 1 | 1028 |
| 2042 | 1029 . { |
| 8535 | 1030 LEXER_DEBUG ("."); |
| 1031 | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1032 xunput (yytext[0], yytext); |
| 4248 | 1033 |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
1034 int c = text_yyinput (); |
| 4248 | 1035 |
| 1036 if (c != EOF) | |
| 4240 | 1037 { |
| 1038 current_input_column++; | |
| 1039 | |
| 1040 error ("invalid character `%s' (ASCII %d) near line %d, column %d", | |
| 4248 | 1041 undo_string_escape (static_cast<char> (c)), c, |
| 4240 | 1042 input_line_number, current_input_column); |
| 1043 | |
| 1044 return LEXICAL_ERROR; | |
| 1045 } | |
| 1046 else | |
| 1047 TOK_RETURN (END_OF_INPUT); | |
| 2066 | 1048 } |
| 1 | 1049 |
| 1050 %% | |
| 1051 | |
| 767 | 1052 // GAG. |
| 1053 // | |
| 1054 // If we're reading a matrix and the next character is '[', make sure | |
| 1055 // that we insert a comma ahead of it. | |
| 1056 | |
| 146 | 1057 void |
| 1 | 1058 do_comma_insert_check (void) |
| 1059 { | |
| 1001 | 1060 int spc_gobbled = eat_continuation (); |
| 2970 | 1061 |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
1062 int c = text_yyinput (); |
| 2970 | 1063 |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1064 xunput (c, yytext); |
| 2970 | 1065 |
| 1001 | 1066 if (spc_gobbled) |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1067 xunput (' ', yytext); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1068 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1069 lexer_flags.do_comma_insert = (! lexer_flags.looking_at_object_index.front () |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1070 && lexer_flags.bracketflag && c == '['); |
| 1 | 1071 } |
| 1072 | |
| 767 | 1073 // Fix things up for errors or interrupts. The parser is never called |
| 1074 // recursively, so it is always safe to reinitialize its state before | |
| 1075 // doing any parsing. | |
| 1076 | |
| 1 | 1077 void |
| 1078 reset_parser (void) | |
| 1079 { | |
| 1826 | 1080 // Start off on the right foot. |
| 4323 | 1081 BEGIN (INITIAL); |
| 4318 | 1082 |
| 3883 | 1083 parser_end_of_input = false; |
| 4238 | 1084 |
| 1085 while (! symtab_context.empty ()) | |
| 1086 symtab_context.pop (); | |
| 287 | 1087 |
| 1826 | 1088 // We do want a prompt by default. |
| 1 | 1089 promptflag = 1; |
| 287 | 1090 |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1091 // We are not in a block comment. |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1092 block_comment_nesting_level = 0; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1093 |
| 3351 | 1094 // Error may have occurred inside some brackets, braces, or parentheses. |
| 985 | 1095 nesting_level.clear (); |
| 287 | 1096 |
| 1826 | 1097 // Clear out the stack of token info used to track line and column |
| 1098 // numbers. | |
| 143 | 1099 while (! token_stack.empty ()) |
| 4214 | 1100 { |
| 1101 delete token_stack.top (); | |
| 1102 token_stack.pop (); | |
| 1103 } | |
| 287 | 1104 |
| 1826 | 1105 // Can be reset by defining a function. |
| 9476 | 1106 if (! (reading_script_file || reading_fcn_file || reading_classdef_file)) |
| 985 | 1107 { |
| 1108 current_input_column = 1; | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1109 input_line_number = command_editor::current_command_number (); |
| 985 | 1110 } |
| 287 | 1111 |
| 1826 | 1112 // Only ask for input from stdin if we are expecting interactive |
| 1113 // input. | |
| 3174 | 1114 if ((interactive || forced_interactive) |
| 3880 | 1115 && ! (reading_fcn_file |
| 9476 | 1116 || reading_classdef_file |
| 3880 | 1117 || reading_script_file |
| 1118 || get_input_from_eval_string | |
| 3174 | 1119 || input_from_startup_file)) |
| 287 | 1120 yyrestart (stdin); |
| 991 | 1121 |
| 1826 | 1122 // Clear the buffer for help text. |
| 4426 | 1123 while (! help_buf.empty ()) |
| 1124 help_buf.pop (); | |
| 1755 | 1125 |
| 1826 | 1126 // Reset other flags. |
| 1127 lexer_flags.init (); | |
| 1 | 1128 } |
| 1129 | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1130 static void |
| 8535 | 1131 display_character (char c) |
| 1132 { | |
| 1133 if (isgraph (c)) | |
| 1134 std::cerr << c; | |
| 1135 else | |
| 1136 switch (c) | |
| 1137 { | |
| 1138 case 0: | |
| 1139 std::cerr << "NUL"; | |
| 1140 break; | |
| 1141 | |
| 1142 case 1: | |
| 1143 std::cerr << "SOH"; | |
| 1144 break; | |
| 1145 | |
| 1146 case 2: | |
| 1147 std::cerr << "STX"; | |
| 1148 break; | |
| 1149 | |
| 1150 case 3: | |
| 1151 std::cerr << "ETX"; | |
| 1152 break; | |
| 1153 | |
| 1154 case 4: | |
| 1155 std::cerr << "EOT"; | |
| 1156 break; | |
| 1157 | |
| 1158 case 5: | |
| 1159 std::cerr << "ENQ"; | |
| 1160 break; | |
| 1161 | |
| 1162 case 6: | |
| 1163 std::cerr << "ACK"; | |
| 1164 break; | |
| 1165 | |
| 1166 case 7: | |
| 1167 std::cerr << "\\a"; | |
| 1168 break; | |
| 1169 | |
| 1170 case 8: | |
| 1171 std::cerr << "\\b"; | |
| 1172 break; | |
| 1173 | |
| 1174 case 9: | |
| 1175 std::cerr << "\\t"; | |
| 1176 break; | |
| 1177 | |
| 1178 case 10: | |
| 1179 std::cerr << "\\n"; | |
| 1180 break; | |
| 1181 | |
| 1182 case 11: | |
| 1183 std::cerr << "\\v"; | |
| 1184 break; | |
| 1185 | |
| 1186 case 12: | |
| 1187 std::cerr << "\\f"; | |
| 1188 break; | |
| 1189 | |
| 1190 case 13: | |
| 1191 std::cerr << "\\r"; | |
| 1192 break; | |
| 1193 | |
| 1194 case 14: | |
| 1195 std::cerr << "SO"; | |
| 1196 break; | |
| 1197 | |
| 1198 case 15: | |
| 1199 std::cerr << "SI"; | |
| 1200 break; | |
| 1201 | |
| 1202 case 16: | |
| 1203 std::cerr << "DLE"; | |
| 1204 break; | |
| 1205 | |
| 1206 case 17: | |
| 1207 std::cerr << "DC1"; | |
| 1208 break; | |
| 1209 | |
| 1210 case 18: | |
| 1211 std::cerr << "DC2"; | |
| 1212 break; | |
| 1213 | |
| 1214 case 19: | |
| 1215 std::cerr << "DC3"; | |
| 1216 break; | |
| 1217 | |
| 1218 case 20: | |
| 1219 std::cerr << "DC4"; | |
| 1220 break; | |
| 1221 | |
| 1222 case 21: | |
| 1223 std::cerr << "NAK"; | |
| 1224 break; | |
| 1225 | |
| 1226 case 22: | |
| 1227 std::cerr << "SYN"; | |
| 1228 break; | |
| 1229 | |
| 1230 case 23: | |
| 1231 std::cerr << "ETB"; | |
| 1232 break; | |
| 1233 | |
| 1234 case 24: | |
| 1235 std::cerr << "CAN"; | |
| 1236 break; | |
| 1237 | |
| 1238 case 25: | |
| 1239 std::cerr << "EM"; | |
| 1240 break; | |
| 1241 | |
| 1242 case 26: | |
| 1243 std::cerr << "SUB"; | |
| 1244 break; | |
| 1245 | |
| 1246 case 27: | |
| 1247 std::cerr << "ESC"; | |
| 1248 break; | |
| 1249 | |
| 1250 case 28: | |
| 1251 std::cerr << "FS"; | |
| 1252 break; | |
| 1253 | |
| 1254 case 29: | |
| 1255 std::cerr << "GS"; | |
| 1256 break; | |
| 1257 | |
| 1258 case 30: | |
| 1259 std::cerr << "RS"; | |
| 1260 break; | |
| 1261 | |
| 1262 case 31: | |
| 1263 std::cerr << "US"; | |
| 1264 break; | |
| 1265 | |
| 1266 case 32: | |
| 1267 std::cerr << "SPACE"; | |
| 1268 break; | |
| 1269 | |
| 1270 case 127: | |
| 1271 std::cerr << "DEL"; | |
| 1272 break; | |
| 1273 } | |
| 1274 } | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1275 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1276 static int |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1277 text_yyinput (void) |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1278 { |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1279 int c = yyinput (); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1280 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1281 if (lexer_debug_flag) |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1282 { |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1283 std::cerr << "I: "; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1284 display_character (c); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1285 std::cerr << std::endl; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1286 } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1287 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1288 // Convert CRLF into just LF and single CR into LF. |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1289 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1290 if (c == '\r') |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1291 { |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1292 c = yyinput (); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1293 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1294 if (lexer_debug_flag) |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1295 { |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1296 std::cerr << "I: "; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1297 display_character (c); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1298 std::cerr << std::endl; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1299 } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1300 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1301 if (c != '\n') |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1302 { |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1303 xunput (c, yytext); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1304 c = '\n'; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1305 } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1306 } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1307 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1308 if (c == '\n') |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1309 input_line_number++; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1310 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1311 return c; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1312 } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1313 |
| 8535 | 1314 static void |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1315 xunput (char c, char *buf) |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1316 { |
| 8535 | 1317 if (lexer_debug_flag) |
| 1318 { | |
| 1319 std::cerr << "U: "; | |
| 1320 display_character (c); | |
| 1321 std::cerr << std::endl; | |
| 1322 } | |
| 1323 | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1324 if (c == '\n') |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1325 input_line_number--; |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1326 |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1327 yyunput (c, buf); |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1328 } |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1329 |
| 767 | 1330 // If we read some newlines, we need figure out what column we're |
| 1331 // really looking at. | |
| 1332 | |
| 1 | 1333 static void |
| 1334 fixup_column_count (char *s) | |
| 1335 { | |
| 1336 char c; | |
| 1337 while ((c = *s++) != '\0') | |
| 1338 { | |
| 1339 if (c == '\n') | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1340 { |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1341 input_line_number++; |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1342 current_input_column = 1; |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1343 } |
| 1 | 1344 else |
| 1345 current_input_column++; | |
| 1346 } | |
| 1347 } | |
| 1348 | |
| 767 | 1349 // Include these so that we don't have to link to libfl.a. |
| 246 | 1350 |
| 3332 | 1351 int |
| 1 | 1352 yywrap (void) |
| 1353 { | |
| 287 | 1354 return 1; |
| 1 | 1355 } |
| 1356 | |
| 767 | 1357 // Tell us all what the current buffer is. |
| 1358 | |
| 1 | 1359 YY_BUFFER_STATE |
| 1360 current_buffer (void) | |
| 1361 { | |
| 1362 return YY_CURRENT_BUFFER; | |
| 1363 } | |
| 1364 | |
| 767 | 1365 // Create a new buffer. |
| 1366 | |
| 1 | 1367 YY_BUFFER_STATE |
| 1368 create_buffer (FILE *f) | |
| 1369 { | |
| 1370 return yy_create_buffer (f, YY_BUF_SIZE); | |
| 1371 } | |
| 1372 | |
| 767 | 1373 // Start reading a new buffer. |
| 1374 | |
| 1 | 1375 void |
| 1376 switch_to_buffer (YY_BUFFER_STATE buf) | |
| 1377 { | |
| 1378 yy_switch_to_buffer (buf); | |
| 1379 } | |
| 1380 | |
| 767 | 1381 // Delete a buffer. |
| 1382 | |
| 1 | 1383 void |
| 1384 delete_buffer (YY_BUFFER_STATE buf) | |
| 1385 { | |
| 1386 yy_delete_buffer (buf); | |
| 1387 } | |
| 1388 | |
| 767 | 1389 // Restore a buffer (for unwind-prot). |
| 1390 | |
| 1 | 1391 void |
| 1392 restore_input_buffer (void *buf) | |
| 1393 { | |
| 2861 | 1394 switch_to_buffer (static_cast<YY_BUFFER_STATE> (buf)); |
| 1 | 1395 } |
| 1396 | |
| 767 | 1397 // Delete a buffer (for unwind-prot). |
| 1398 | |
| 1 | 1399 void |
| 1400 delete_input_buffer (void *buf) | |
| 1401 { | |
| 2861 | 1402 delete_buffer (static_cast<YY_BUFFER_STATE> (buf)); |
| 1 | 1403 } |
| 1404 | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1405 static bool |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1406 inside_any_object_index (void) |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1407 { |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1408 bool retval = false; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1409 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1410 for (std::list<bool>::const_iterator i = lexer_flags.looking_at_object_index.begin (); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1411 i != lexer_flags.looking_at_object_index.end (); i++) |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1412 { |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1413 if (*i) |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1414 { |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1415 retval = true; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1416 break; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1417 } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1418 } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1419 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1420 return retval; |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1421 } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
1422 |
| 4238 | 1423 // Handle keywords. Return -1 if the keyword should be ignored. |
| 767 | 1424 |
| 1 | 1425 static int |
| 4867 | 1426 is_keyword_token (const std::string& s) |
| 1 | 1427 { |
| 3805 | 1428 int l = input_line_number; |
| 1429 int c = current_input_column; | |
| 1430 | |
| 1823 | 1431 int len = s.length (); |
| 922 | 1432 |
| 5088 | 1433 const octave_kw *kw = octave_kw_hash::in_word_set (s.c_str (), len); |
| 191 | 1434 |
| 1497 | 1435 if (kw) |
| 143 | 1436 { |
| 1497 | 1437 yylval.tok_val = 0; |
| 1438 | |
| 1439 switch (kw->kw_id) | |
| 1440 { | |
| 1441 case break_kw: | |
| 1442 case catch_kw: | |
| 1443 case continue_kw: | |
| 1444 case else_kw: | |
| 2764 | 1445 case otherwise_kw: |
| 1497 | 1446 case return_kw: |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1447 case unwind_protect_cleanup_kw: |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1448 lexer_flags.at_beginning_of_statement = true; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1449 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1450 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1451 case case_kw: |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1452 case elseif_kw: |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1453 case global_kw: |
| 2846 | 1454 case static_kw: |
| 3484 | 1455 case until_kw: |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1456 break; |
| 1497 | 1457 |
| 1458 case end_kw: | |
| 9476 | 1459 if (! reading_classdef_file |
| 1460 && (inside_any_object_index () | |
| 1461 || (lexer_flags.defining_func | |
| 1462 && ! (lexer_flags.looking_at_return_list | |
| 1463 || lexer_flags.parsed_function_name)))) | |
| 4234 | 1464 return 0; |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
1465 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
1466 yylval.tok_val = new token (token::simple_end, l, c); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
1467 lexer_flags.at_beginning_of_statement = true; |
| 1497 | 1468 break; |
| 1469 | |
| 1470 case end_try_catch_kw: | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1471 yylval.tok_val = new token (token::try_catch_end, l, c); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1472 lexer_flags.at_beginning_of_statement = true; |
| 1497 | 1473 break; |
| 1474 | |
| 1475 case end_unwind_protect_kw: | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1476 yylval.tok_val = new token (token::unwind_protect_end, l, c); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1477 lexer_flags.at_beginning_of_statement = true; |
| 1497 | 1478 break; |
| 1479 | |
| 1480 case endfor_kw: | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1481 yylval.tok_val = new token (token::for_end, l, c); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1482 lexer_flags.at_beginning_of_statement = true; |
| 1497 | 1483 break; |
| 1484 | |
| 1485 case endfunction_kw: | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
1486 yylval.tok_val = new token (token::function_end, l, c); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
1487 lexer_flags.at_beginning_of_statement = true; |
| 1497 | 1488 break; |
| 1489 | |
| 1490 case endif_kw: | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1491 yylval.tok_val = new token (token::if_end, l, c); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1492 lexer_flags.at_beginning_of_statement = true; |
| 1497 | 1493 break; |
| 1494 | |
| 2764 | 1495 case endswitch_kw: |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1496 yylval.tok_val = new token (token::switch_end, l, c); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1497 lexer_flags.at_beginning_of_statement = true; |
| 2764 | 1498 break; |
| 1499 | |
| 1497 | 1500 case endwhile_kw: |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1501 yylval.tok_val = new token (token::while_end, l, c); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1502 lexer_flags.at_beginning_of_statement = true; |
| 1497 | 1503 break; |
| 9476 | 1504 |
| 1505 case endclassdef_kw: | |
| 1506 yylval.tok_val = new token (token::classdef_end, l, c); | |
| 1507 lexer_flags.at_beginning_of_statement = true; | |
| 1508 break; | |
| 1509 | |
| 1510 case endevents_kw: | |
| 1511 yylval.tok_val = new token (token::events_end, l, c); | |
| 1512 lexer_flags.at_beginning_of_statement = true; | |
| 1513 break; | |
| 1514 | |
| 1515 case endmethods_kw: | |
| 1516 yylval.tok_val = new token (token::methods_end, l, c); | |
| 1517 lexer_flags.at_beginning_of_statement = true; | |
| 1518 break; | |
| 1519 | |
| 1520 case endproperties_kw: | |
| 1521 yylval.tok_val = new token (token::properties_end, l, c); | |
| 1522 lexer_flags.at_beginning_of_statement = true; | |
| 1523 break; | |
| 1497 | 1524 |
| 1525 case for_kw: | |
| 1526 case while_kw: | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1527 promptflag--; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1528 lexer_flags.looping++; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1529 break; |
| 4238 | 1530 |
| 1531 case do_kw: | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1532 lexer_flags.at_beginning_of_statement = true; |
| 1497 | 1533 promptflag--; |
| 1826 | 1534 lexer_flags.looping++; |
| 1497 | 1535 break; |
| 1536 | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1537 case try_kw: |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1538 case unwind_protect_kw: |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1539 lexer_flags.at_beginning_of_statement = true; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1540 promptflag--; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1541 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1542 |
| 1497 | 1543 case if_kw: |
| 2764 | 1544 case switch_kw: |
| 1497 | 1545 promptflag--; |
| 1546 break; | |
| 1547 | |
| 9476 | 1548 case get_kw: |
| 1549 case set_kw: | |
| 1550 // 'get' and 'set' are keywords in classdef method | |
| 1551 // declarations. | |
| 1552 if (! lexer_flags.maybe_classdef_get_set_method) | |
| 1553 return 0; | |
| 1554 break; | |
| 1555 | |
| 1556 case properties_kw: | |
| 1557 case methods_kw: | |
| 1558 case events_kw: | |
| 1559 // 'properties', 'methods' and 'events' are keywords for | |
| 1560 // classdef blocks. | |
| 1561 if (! lexer_flags.parsing_classdef) | |
| 1562 return 0; | |
| 1563 // fall through ... | |
| 1564 | |
| 1565 case classdef_kw: | |
| 1566 // 'classdef' is always a keyword. | |
| 1567 promptflag--; | |
| 1568 break; | |
| 1569 | |
| 1497 | 1570 case function_kw: |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
1571 promptflag--; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
1572 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
1573 lexer_flags.defining_func = true; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
1574 lexer_flags.parsed_function_name = false; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
1575 |
| 9476 | 1576 if (! (reading_fcn_file || reading_script_file |
| 1577 || reading_classdef_file)) | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
1578 input_line_number = 1; |
| 1497 | 1579 break; |
| 1580 | |
| 3174 | 1581 case magic_file_kw: |
| 1582 { | |
| 9476 | 1583 if ((reading_fcn_file || reading_script_file |
| 1584 || reading_classdef_file) | |
| 3174 | 1585 && ! curr_fcn_file_full_name.empty ()) |
| 1586 yylval.tok_val = new token (curr_fcn_file_full_name, l, c); | |
| 1587 else | |
| 1588 yylval.tok_val = new token ("stdin", l, c); | |
| 1589 } | |
| 1590 break; | |
| 1591 | |
| 1592 case magic_line_kw: | |
| 1593 yylval.tok_val = new token (static_cast<double> (l), "", l, c); | |
| 1594 break; | |
| 1595 | |
| 1497 | 1596 default: |
| 1597 panic_impossible (); | |
| 1598 } | |
| 1599 | |
| 1600 if (! yylval.tok_val) | |
| 1601 yylval.tok_val = new token (l, c); | |
| 1602 | |
| 476 | 1603 token_stack.push (yylval.tok_val); |
| 1497 | 1604 |
| 1605 return kw->tok; | |
| 143 | 1606 } |
| 1 | 1607 |
| 1608 return 0; | |
| 1609 } | |
| 1610 | |
| 2702 | 1611 static bool |
| 3523 | 1612 is_variable (const std::string& name) |
| 2702 | 1613 { |
|
8001
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7898
diff
changeset
|
1614 return (symbol_table::is_variable (name) |
|
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7898
diff
changeset
|
1615 || (lexer_flags.pending_local_variables.find (name) |
|
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7898
diff
changeset
|
1616 != lexer_flags.pending_local_variables.end ())); |
| 2702 | 1617 } |
| 1618 | |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1619 static std::string |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1620 grab_block_comment (stream_reader& reader, bool& eof) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1621 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1622 std::string buf; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1623 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1624 bool at_bol = true; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1625 bool look_for_marker = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1626 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1627 bool warned_incompatible = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1628 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1629 int c = 0; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1630 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1631 while ((c = reader.getc ()) != EOF) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1632 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1633 current_input_column++; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1634 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1635 if (look_for_marker) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1636 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1637 at_bol = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1638 look_for_marker = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1639 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1640 if (c == '{' || c == '}') |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1641 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1642 std::string tmp_buf (1, static_cast<char> (c)); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1643 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1644 int type = c; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1645 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1646 bool done = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1647 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1648 while ((c = reader.getc ()) != EOF && ! done) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1649 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1650 current_input_column++; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1651 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1652 switch (c) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1653 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1654 case ' ': |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1655 case '\t': |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1656 tmp_buf += static_cast<char> (c); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1657 break; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1658 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1659 case '\n': |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1660 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1661 current_input_column = 0; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1662 at_bol = true; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1663 done = true; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1664 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1665 if (type == '{') |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1666 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1667 block_comment_nesting_level++; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1668 promptflag--; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1669 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1670 else |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1671 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1672 block_comment_nesting_level--; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1673 promptflag++; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1674 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1675 if (block_comment_nesting_level == 0) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1676 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1677 buf += grab_comment_block (reader, true, eof); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1678 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1679 return buf; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1680 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1681 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1682 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1683 break; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1684 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1685 default: |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1686 at_bol = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1687 tmp_buf += static_cast<char> (c); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1688 buf += tmp_buf; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1689 done = true; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1690 break; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1691 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1692 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1693 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1694 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1695 |
|
7898
cce16b4e0970
lex.l (grab_block_comment): Use parens around || expression within && expression
John W. Eaton <jwe@octave.org>
parents:
7728
diff
changeset
|
1696 if (at_bol && (c == '%' || c == '#')) |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1697 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1698 if (c == '#' && ! warned_incompatible) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1699 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1700 warned_incompatible = true; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1701 maybe_gripe_matlab_incompatible_comment (c); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1702 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1703 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1704 at_bol = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1705 look_for_marker = true; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1706 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1707 else |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1708 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1709 buf += static_cast<char> (c); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1710 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1711 if (c == '\n') |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1712 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1713 current_input_column = 0; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1714 at_bol = true; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1715 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1716 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1717 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1718 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1719 if (c == EOF) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1720 eof = true; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1721 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1722 return buf; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1723 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1724 |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1725 std::string |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1726 grab_comment_block (stream_reader& reader, bool at_bol, |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1727 bool& eof) |
| 1 | 1728 { |
| 4426 | 1729 std::string buf; |
| 1019 | 1730 |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1731 // TRUE means we are at the beginning of a comment block. |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1732 bool begin_comment = false; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1733 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1734 // TRUE means we are currently reading a comment block. |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1735 bool in_comment = false; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1736 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1737 bool warned_incompatible = false; |
| 3665 | 1738 |
| 1019 | 1739 int c = 0; |
| 1 | 1740 |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1741 while ((c = reader.getc ()) != EOF) |
| 1019 | 1742 { |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1743 current_input_column++; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1744 |
| 2300 | 1745 if (begin_comment) |
| 1746 { | |
| 1747 if (c == '%' || c == '#') | |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1748 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1749 at_bol = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1750 continue; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1751 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1752 else if (at_bol && c == '{') |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1753 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1754 std::string tmp_buf (1, static_cast<char> (c)); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1755 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1756 bool done = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1757 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1758 while ((c = reader.getc ()) != EOF && ! done) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1759 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1760 current_input_column++; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1761 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1762 switch (c) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1763 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1764 case ' ': |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1765 case '\t': |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1766 tmp_buf += static_cast<char> (c); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1767 break; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1768 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1769 case '\n': |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1770 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1771 current_input_column = 0; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1772 at_bol = true; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1773 done = true; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1774 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1775 block_comment_nesting_level++; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1776 promptflag--; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1777 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1778 buf += grab_block_comment (reader, eof); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1779 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1780 in_comment = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1781 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1782 if (eof) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1783 goto done; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1784 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1785 break; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1786 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1787 default: |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1788 at_bol = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1789 tmp_buf += static_cast<char> (c); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1790 buf += tmp_buf; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1791 done = true; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1792 break; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1793 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1794 } |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1795 } |
| 2300 | 1796 else |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1797 { |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1798 at_bol = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1799 begin_comment = false; |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1800 } |
| 2300 | 1801 } |
| 1802 | |
| 1019 | 1803 if (in_comment) |
| 1 | 1804 { |
| 4426 | 1805 buf += static_cast<char> (c); |
| 1755 | 1806 |
| 1019 | 1807 if (c == '\n') |
| 3427 | 1808 { |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1809 at_bol = true; |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1810 current_input_column = 0; |
| 3427 | 1811 in_comment = false; |
|
8537
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1812 |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1813 // FIXME -- bailing out here prevents things like |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1814 // |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1815 // octave> # comment |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1816 // octave> x = 1 |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1817 // |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1818 // from failing at the command line, while still |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1819 // allowing blocks of comments to be grabbed properly |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1820 // for function doc strings. But only the first line of |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1821 // a mult-line doc string will be picked up for |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1822 // functions defined on the command line. We need a |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1823 // better way of collecting these comments... |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1824 if (! (reading_fcn_file || reading_script_file)) |
|
17ef48c699a5
lex.l (grab_comment_block): if not reading from a file, bail at first newline inside a comment:
John W. Eaton <jwe@octave.org>
parents:
8536
diff
changeset
|
1825 goto done; |
| 3427 | 1826 } |
| 1019 | 1827 } |
| 1828 else | |
| 1829 { | |
| 1830 switch (c) | |
| 991 | 1831 { |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1832 case ' ': |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1833 case '\t': |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1834 break; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1835 |
| 4037 | 1836 case '#': |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1837 if (! warned_incompatible) |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1838 { |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1839 warned_incompatible = true; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1840 maybe_gripe_matlab_incompatible_comment (c); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1841 } |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1842 // fall through... |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1843 |
| 1019 | 1844 case '%': |
| 2300 | 1845 in_comment = true; |
| 1846 begin_comment = true; | |
| 1019 | 1847 break; |
| 777 | 1848 |
| 1019 | 1849 default: |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1850 current_input_column--; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1851 reader.ungetc (c); |
| 1019 | 1852 goto done; |
| 1 | 1853 } |
| 1854 } | |
| 1019 | 1855 } |
| 991 | 1856 |
| 1019 | 1857 done: |
| 991 | 1858 |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1859 if (c == EOF) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1860 eof = true; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1861 |
| 4426 | 1862 return buf; |
| 1 | 1863 } |
| 1864 | |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1865 class |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1866 flex_stream_reader : public stream_reader |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1867 { |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1868 public: |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1869 flex_stream_reader (char *buf_arg) : stream_reader (), buf (buf_arg) { } |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1870 |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
1871 int getc (void) { return ::text_yyinput (); } |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1872 int ungetc (int c) { ::xunput (c, buf); return 0; } |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1873 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1874 private: |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1875 char *buf; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1876 }; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1877 |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1878 static int |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1879 process_comment (bool start_in_block, bool& eof) |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1880 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1881 eof = false; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1882 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1883 std::string help_txt; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1884 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1885 if (! help_buf.empty ()) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1886 help_txt = help_buf.top (); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1887 |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1888 flex_stream_reader flex_reader (yytext); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1889 |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1890 // process_comment is only supposed to be called when we are not |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1891 // initially looking at a block comment. |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1892 |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1893 std::string txt = start_in_block |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1894 ? grab_block_comment (flex_reader, eof) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
1895 : grab_comment_block (flex_reader, false, eof); |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1896 |
| 8535 | 1897 if (lexer_debug_flag) |
|
8536
de1b944d5306
lex.l: finish previous change
John W. Eaton <jwe@octave.org>
parents:
8535
diff
changeset
|
1898 std::cerr << "C: " << txt << std::endl; |
| 8535 | 1899 |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1900 if (help_txt.empty () && nesting_level.none ()) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1901 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1902 if (! help_buf.empty ()) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1903 help_buf.pop (); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1904 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1905 help_buf.push (txt); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1906 } |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1907 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
1908 octave_comment_buffer::append (txt); |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1909 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1910 current_input_column = 1; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1911 lexer_flags.quote_is_transpose = false; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1912 lexer_flags.convert_spaces_to_comma = true; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1913 lexer_flags.at_beginning_of_statement = true; |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1914 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1915 if (YY_START == COMMAND_START) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1916 BEGIN (INITIAL); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1917 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1918 if (nesting_level.none ()) |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
1919 return '\n'; |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1920 else if (nesting_level.is_bracket_or_brace ()) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1921 return ';'; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1922 else |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1923 return 0; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1924 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
1925 |
| 767 | 1926 // Return 1 if the given character matches any character in the given |
| 1927 // string. | |
| 1928 | |
| 2857 | 1929 static bool |
| 2804 | 1930 match_any (char c, const char *s) |
| 1 | 1931 { |
| 1932 char tmp; | |
| 1933 while ((tmp = *s++) != '\0') | |
| 1934 { | |
| 1935 if (c == tmp) | |
| 2857 | 1936 return true; |
| 1 | 1937 } |
| 2857 | 1938 return false; |
| 1 | 1939 } |
| 1940 | |
| 767 | 1941 // Given information about the spacing surrounding an operator, |
| 1942 // return 1 if it looks like it should be treated as a binary | |
| 1943 // operator. For example, | |
| 1944 // | |
| 3774 | 1945 // [ 1 + 2 ] or [ 1+ 2] or [ 1+2 ] ==> binary |
| 1946 // | |
| 1947 // [ 1 +2 ] ==> unary | |
| 767 | 1948 |
| 2857 | 1949 static bool |
| 3246 | 1950 looks_like_bin_op (bool spc_prev, int next_char) |
| 1 | 1951 { |
| 3246 | 1952 bool spc_next = (next_char == ' ' || next_char == '\t'); |
| 1953 | |
| 608 | 1954 return ((spc_prev && spc_next) || ! spc_prev); |
| 1 | 1955 } |
| 1956 | |
| 3263 | 1957 // Recognize separators. If the separator is a CRLF pair, it is |
| 1958 // replaced by a single LF. | |
| 1959 | |
| 1960 static bool | |
| 1961 next_token_is_sep_op (void) | |
| 1962 { | |
| 1963 bool retval = false; | |
| 1964 | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
1965 int c = text_yyinput (); |
|
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
1966 |
|
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
1967 retval = match_any (c, ",;\n]"); |
|
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
1968 |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1969 xunput (c, yytext); |
| 3263 | 1970 |
| 1971 return retval; | |
| 1972 } | |
| 1973 | |
| 767 | 1974 // Try to determine if the next token should be treated as a postfix |
| 1975 // unary operator. This is ugly, but it seems to do the right thing. | |
| 1976 | |
| 2857 | 1977 static bool |
| 3246 | 1978 next_token_is_postfix_unary_op (bool spc_prev) |
| 1 | 1979 { |
| 2857 | 1980 bool un_op = false; |
| 1 | 1981 |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
1982 int c0 = text_yyinput (); |
| 1 | 1983 |
| 3246 | 1984 if (c0 == '\'' && ! spc_prev) |
| 1985 { | |
| 1986 un_op = true; | |
| 1987 } | |
| 1988 else if (c0 == '.') | |
| 1989 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
1990 int c1 = text_yyinput (); |
| 3246 | 1991 un_op = (c1 == '\''); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1992 xunput (c1, yytext); |
| 3246 | 1993 } |
| 4613 | 1994 else if (c0 == '+') |
| 1995 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
1996 int c1 = text_yyinput (); |
| 4613 | 1997 un_op = (c1 == '+'); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
1998 xunput (c1, yytext); |
| 4613 | 1999 } |
| 2000 else if (c0 == '-') | |
| 2001 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2002 int c1 = text_yyinput (); |
| 4613 | 2003 un_op = (c1 == '-'); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2004 xunput (c1, yytext); |
| 4613 | 2005 } |
| 1 | 2006 |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2007 xunput (c0, yytext); |
| 1 | 2008 |
| 2009 return un_op; | |
| 2010 } | |
| 2011 | |
| 767 | 2012 // Try to determine if the next token should be treated as a binary |
| 3246 | 2013 // operator. |
| 1521 | 2014 // |
| 3246 | 2015 // This kluge exists because whitespace is not always ignored inside |
| 3774 | 2016 // the square brackets that are used to create matrix objects (though |
| 2017 // spacing only really matters in the cases that can be interpreted | |
| 2018 // either as binary ops or prefix unary ops: currently just +, -). | |
| 2019 // | |
| 3779 | 2020 // Note that a line continuation directly following a + or - operator |
| 2021 // (e.g., the characters '[' 'a' ' ' '+' '\' LFD 'b' ']') will be | |
| 2022 // parsed as a binary operator. | |
| 767 | 2023 |
| 2857 | 2024 static bool |
| 3246 | 2025 next_token_is_bin_op (bool spc_prev) |
| 1 | 2026 { |
| 2857 | 2027 bool bin_op = false; |
| 1 | 2028 |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2029 int c0 = text_yyinput (); |
| 1 | 2030 |
| 2031 switch (c0) | |
| 2032 { | |
| 777 | 2033 case '+': |
| 2034 case '-': | |
| 3774 | 2035 { |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2036 int c1 = text_yyinput (); |
| 3774 | 2037 |
| 2038 switch (c1) | |
| 2039 { | |
| 2040 case '+': | |
| 2041 case '-': | |
| 2042 // Unary ops, spacing doesn't matter. | |
| 2043 break; | |
| 2044 | |
| 2045 case '=': | |
| 2046 // Binary ops, spacing doesn't matter. | |
| 2047 bin_op = true; | |
| 2048 break; | |
| 2049 | |
| 2050 default: | |
| 2051 // Could be either, spacing matters. | |
| 2052 bin_op = looks_like_bin_op (spc_prev, c1); | |
| 2053 break; | |
| 2054 } | |
| 2055 | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2056 xunput (c1, yytext); |
| 3774 | 2057 } |
| 2058 break; | |
| 2059 | |
| 2060 case ':': | |
| 3246 | 2061 case '/': |
| 2062 case '\\': | |
| 2063 case '^': | |
| 3774 | 2064 // Always a binary op (may also include /=, \=, and ^=). |
| 2065 bin_op = true; | |
| 1276 | 2066 break; |
| 2067 | |
| 3246 | 2068 // .+ .- ./ .\ .^ .* .** |
| 1554 | 2069 case '.': |
| 2070 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2071 int c1 = text_yyinput (); |
| 3246 | 2072 |
| 3774 | 2073 if (match_any (c1, "+-/\\^*")) |
| 2074 // Always a binary op (may also include .+=, .-=, ./=, ...). | |
| 2075 bin_op = true; | |
| 3698 | 2076 else if (! isdigit (c1) && c1 != ' ' && c1 != '\t' && c1 != '.') |
| 3774 | 2077 // A structure element reference is a binary op. |
| 2078 bin_op = true; | |
| 3246 | 2079 |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2080 xunput (c1, yytext); |
| 1554 | 2081 } |
| 2082 break; | |
| 2083 | |
| 3246 | 2084 // = == & && | || * ** |
| 2085 case '=': | |
| 1 | 2086 case '&': |
| 3246 | 2087 case '|': |
| 1 | 2088 case '*': |
| 3774 | 2089 // Always a binary op (may also include ==, &&, ||, **). |
| 2090 bin_op = true; | |
| 3246 | 2091 break; |
| 2092 | |
| 3774 | 2093 // < <= <> > >= |
| 1 | 2094 case '<': |
| 2095 case '>': | |
| 3774 | 2096 // Always a binary op (may also include <=, <>, >=). |
| 2097 bin_op = true; | |
| 2098 break; | |
| 2099 | |
| 2100 // ~= != | |
| 777 | 2101 case '~': |
| 2102 case '!': | |
| 3246 | 2103 { |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2104 int c1 = text_yyinput (); |
| 3246 | 2105 |
| 3774 | 2106 // ~ and ! can be unary ops, so require following =. |
| 2107 if (c1 == '=') | |
| 2108 bin_op = true; | |
| 3246 | 2109 |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2110 xunput (c1, yytext); |
| 3246 | 2111 } |
| 1 | 2112 break; |
| 2113 | |
| 2114 default: | |
| 1276 | 2115 break; |
| 1 | 2116 } |
| 2117 | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2118 xunput (c0, yytext); |
| 1 | 2119 |
| 2120 return bin_op; | |
| 2121 } | |
| 2122 | |
| 767 | 2123 // Used to delete trailing white space from tokens. |
| 2124 | |
| 3536 | 2125 static std::string |
| 1 | 2126 strip_trailing_whitespace (char *s) |
| 2127 { | |
| 3523 | 2128 std::string retval = s; |
| 1 | 2129 |
| 1823 | 2130 size_t pos = retval.find_first_of (" \t"); |
| 1 | 2131 |
| 8021 | 2132 if (pos != std::string::npos) |
| 1823 | 2133 retval.resize (pos); |
| 1 | 2134 |
| 2135 return retval; | |
| 2136 } | |
| 2137 | |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
2138 // FIXME -- we need to handle block comments here. |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
2139 |
| 3665 | 2140 static void |
| 2141 scan_for_comments (const char *text) | |
| 2142 { | |
| 2143 std::string comment_buf; | |
| 2144 | |
| 2145 bool in_comment = false; | |
| 2146 bool beginning_of_comment = false; | |
| 2147 | |
| 2148 int len = strlen (text); | |
| 2149 int i = 0; | |
| 2150 | |
| 2151 while (i < len) | |
| 2152 { | |
| 2153 char c = text[i++]; | |
| 2154 | |
| 2155 switch (c) | |
| 2156 { | |
| 2157 case '%': | |
| 2158 case '#': | |
| 2159 if (in_comment) | |
| 2160 { | |
| 2161 if (! beginning_of_comment) | |
| 3802 | 2162 comment_buf += static_cast<char> (c); |
| 3665 | 2163 } |
| 2164 else | |
| 2165 { | |
| 4037 | 2166 maybe_gripe_matlab_incompatible_comment (c); |
| 3665 | 2167 in_comment = true; |
| 2168 beginning_of_comment = true; | |
| 2169 } | |
| 2170 break; | |
| 2171 | |
| 2172 case '\n': | |
| 2173 if (in_comment) | |
| 2174 { | |
| 3802 | 2175 comment_buf += static_cast<char> (c); |
| 3665 | 2176 octave_comment_buffer::append (comment_buf); |
| 2177 comment_buf.resize (0); | |
| 2178 in_comment = false; | |
| 2179 beginning_of_comment = false; | |
| 2180 } | |
| 2181 break; | |
| 2182 | |
| 2183 default: | |
| 2184 if (in_comment) | |
| 2185 { | |
| 3802 | 2186 comment_buf += static_cast<char> (c); |
| 3665 | 2187 beginning_of_comment = false; |
| 2188 } | |
| 2189 break; | |
| 2190 } | |
| 2191 } | |
| 2192 | |
| 2193 if (! comment_buf.empty ()) | |
| 2194 octave_comment_buffer::append (comment_buf); | |
| 2195 } | |
| 2196 | |
| 1001 | 2197 // Discard whitespace, including comments and continuations. |
| 1088 | 2198 // |
| 2199 // Return value is logical OR of the following values: | |
| 2200 // | |
| 1826 | 2201 // ATE_NOTHING : no spaces to eat |
| 1088 | 2202 // ATE_SPACE_OR_TAB : space or tab in input |
| 2203 // ATE_NEWLINE : bare new line in input | |
| 1001 | 2204 |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
2205 // FIXME -- we need to handle block comments here. |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
2206 |
| 1826 | 2207 static yum_yum |
| 975 | 2208 eat_whitespace (void) |
| 2209 { | |
| 1826 | 2210 yum_yum retval = ATE_NOTHING; |
| 3665 | 2211 |
| 2212 std::string comment_buf; | |
| 2213 | |
| 2857 | 2214 bool in_comment = false; |
| 3665 | 2215 bool beginning_of_comment = false; |
| 2216 | |
| 2217 int c = 0; | |
| 2218 | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2219 while ((c = text_yyinput ()) != EOF) |
| 975 | 2220 { |
| 2221 current_input_column++; | |
| 2222 | |
| 2223 switch (c) | |
| 2224 { | |
| 2225 case ' ': | |
| 2226 case '\t': | |
| 3665 | 2227 if (in_comment) |
| 2228 { | |
| 3802 | 2229 comment_buf += static_cast<char> (c); |
| 3665 | 2230 beginning_of_comment = false; |
| 2231 } | |
| 1088 | 2232 retval |= ATE_SPACE_OR_TAB; |
| 975 | 2233 break; |
| 2234 | |
| 2235 case '\n': | |
| 1088 | 2236 retval |= ATE_NEWLINE; |
| 3665 | 2237 if (in_comment) |
| 2238 { | |
| 3802 | 2239 comment_buf += static_cast<char> (c); |
| 3665 | 2240 octave_comment_buffer::append (comment_buf); |
| 2241 comment_buf.resize (0); | |
| 2242 in_comment = false; | |
| 2243 beginning_of_comment = false; | |
| 2244 } | |
| 975 | 2245 current_input_column = 0; |
| 2246 break; | |
| 2247 | |
| 2248 case '#': | |
| 2249 case '%': | |
| 3665 | 2250 if (in_comment) |
| 2251 { | |
| 2252 if (! beginning_of_comment) | |
| 3802 | 2253 comment_buf += static_cast<char> (c); |
| 3665 | 2254 } |
| 2255 else | |
| 2256 { | |
| 4037 | 2257 maybe_gripe_matlab_incompatible_comment (c); |
| 3665 | 2258 in_comment = true; |
| 2259 beginning_of_comment = true; | |
| 2260 } | |
| 975 | 2261 break; |
| 2262 | |
| 1001 | 2263 case '.': |
| 2264 if (in_comment) | |
| 3665 | 2265 { |
| 3802 | 2266 comment_buf += static_cast<char> (c); |
| 3665 | 2267 beginning_of_comment = false; |
| 2268 break; | |
| 2269 } | |
| 1001 | 2270 else |
| 2271 { | |
| 2272 if (have_ellipsis_continuation ()) | |
| 2273 break; | |
| 2274 else | |
| 2275 goto done; | |
| 2276 } | |
| 2277 | |
| 2278 case '\\': | |
| 2279 if (in_comment) | |
| 3665 | 2280 { |
| 3802 | 2281 comment_buf += static_cast<char> (c); |
| 3665 | 2282 beginning_of_comment = false; |
| 2283 break; | |
| 2284 } | |
| 1001 | 2285 else |
| 2286 { | |
| 3105 | 2287 if (have_continuation ()) |
| 1001 | 2288 break; |
| 2289 else | |
| 2290 goto done; | |
| 2291 } | |
| 2292 | |
| 975 | 2293 default: |
| 2294 if (in_comment) | |
| 3665 | 2295 { |
| 3802 | 2296 comment_buf += static_cast<char> (c); |
| 3665 | 2297 beginning_of_comment = false; |
| 2298 break; | |
| 2299 } | |
| 975 | 2300 else |
| 2301 goto done; | |
| 2302 } | |
| 2303 } | |
| 2304 | |
| 3665 | 2305 if (! comment_buf.empty ()) |
| 2306 octave_comment_buffer::append (comment_buf); | |
| 2307 | |
| 975 | 2308 done: |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2309 xunput (c, yytext); |
| 1082 | 2310 current_input_column--; |
| 1001 | 2311 return retval; |
| 975 | 2312 } |
| 2313 | |
| 3220 | 2314 static inline bool |
| 2315 looks_like_hex (const char *s, int len) | |
| 2316 { | |
| 2317 return (len > 2 && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')); | |
| 2318 } | |
| 2319 | |
| 975 | 2320 static void |
| 3246 | 2321 handle_number (void) |
| 972 | 2322 { |
| 3220 | 2323 double value = 0.0; |
| 2324 int nread = 0; | |
| 2325 | |
| 3598 | 2326 if (looks_like_hex (yytext, strlen (yytext))) |
| 3220 | 2327 { |
| 2328 unsigned long ival; | |
| 3598 | 2329 |
| 2330 nread = sscanf (yytext, "%lx", &ival); | |
| 2331 | |
| 3220 | 2332 value = static_cast<double> (ival); |
| 2333 } | |
| 2334 else | |
| 3598 | 2335 { |
| 2336 char *tmp = strsave (yytext); | |
| 2337 | |
| 2338 char *idx = strpbrk (tmp, "Dd"); | |
| 2621 | 2339 |
| 3598 | 2340 if (idx) |
| 2341 *idx = 'e'; | |
| 2342 | |
| 2343 nread = sscanf (tmp, "%lf", &value); | |
| 2344 | |
| 2345 delete [] tmp; | |
| 2346 } | |
| 972 | 2347 |
| 1826 | 2348 // If yytext doesn't contain a valid number, we are in deep doo doo. |
| 985 | 2349 |
| 972 | 2350 assert (nread == 1); |
| 2351 | |
| 3988 | 2352 lexer_flags.quote_is_transpose = true; |
| 2353 lexer_flags.convert_spaces_to_comma = true; | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
2354 lexer_flags.looking_for_object_index = true; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2355 lexer_flags.at_beginning_of_statement = false; |
| 972 | 2356 |
| 2357 yylval.tok_val = new token (value, yytext, input_line_number, | |
| 2358 current_input_column); | |
| 2359 | |
| 2360 token_stack.push (yylval.tok_val); | |
| 2361 | |
| 2362 current_input_column += yyleng; | |
| 2363 | |
| 2364 do_comma_insert_check (); | |
| 2365 } | |
| 2366 | |
| 1001 | 2367 // We have seen a backslash and need to find out if it should be |
| 2368 // treated as a continuation character. If so, this eats it, up to | |
| 2369 // and including the new line character. | |
| 2370 // | |
| 973 | 2371 // Match whitespace only, followed by a comment character or newline. |
| 2372 // Once a comment character is found, discard all input until newline. | |
| 2373 // If non-whitespace characters are found before comment | |
| 2374 // characters, return 0. Otherwise, return 1. | |
| 2375 | |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
2376 // FIXME -- we need to handle block comments here. |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7722
diff
changeset
|
2377 |
| 2857 | 2378 static bool |
| 3096 | 2379 have_continuation (bool trailing_comments_ok) |
| 973 | 2380 { |
| 5765 | 2381 std::ostringstream buf; |
| 973 | 2382 |
| 3665 | 2383 std::string comment_buf; |
| 2384 | |
| 2857 | 2385 bool in_comment = false; |
| 3665 | 2386 bool beginning_of_comment = false; |
| 2387 | |
| 2388 int c = 0; | |
| 2389 | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2390 while ((c = text_yyinput ()) != EOF) |
| 973 | 2391 { |
| 3802 | 2392 buf << static_cast<char> (c); |
| 973 | 2393 |
| 2394 switch (c) | |
| 2395 { | |
| 2396 case ' ': | |
| 2397 case '\t': | |
| 3665 | 2398 if (in_comment) |
| 2399 { | |
| 3802 | 2400 comment_buf += static_cast<char> (c); |
| 3665 | 2401 beginning_of_comment = false; |
| 2402 } | |
| 973 | 2403 break; |
| 2404 | |
| 2405 case '%': | |
| 2406 case '#': | |
| 1091 | 2407 if (trailing_comments_ok) |
| 3665 | 2408 { |
| 2409 if (in_comment) | |
| 2410 { | |
| 2411 if (! beginning_of_comment) | |
| 3802 | 2412 comment_buf += static_cast<char> (c); |
| 3665 | 2413 } |
| 2414 else | |
| 2415 { | |
| 4037 | 2416 maybe_gripe_matlab_incompatible_comment (c); |
| 3665 | 2417 in_comment = true; |
| 2418 beginning_of_comment = true; | |
| 2419 } | |
| 2420 } | |
| 1091 | 2421 else |
| 2422 goto cleanup; | |
| 973 | 2423 break; |
| 2424 | |
| 2425 case '\n': | |
| 3665 | 2426 if (in_comment) |
| 2427 { | |
| 3802 | 2428 comment_buf += static_cast<char> (c); |
| 3665 | 2429 octave_comment_buffer::append (comment_buf); |
| 2430 } | |
| 975 | 2431 current_input_column = 0; |
| 1001 | 2432 promptflag--; |
| 4037 | 2433 gripe_matlab_incompatible_continuation (); |
| 2857 | 2434 return true; |
| 973 | 2435 |
| 2436 default: | |
| 3665 | 2437 if (in_comment) |
| 2438 { | |
| 3802 | 2439 comment_buf += static_cast<char> (c); |
| 3665 | 2440 beginning_of_comment = false; |
| 2441 } | |
| 2442 else | |
| 1091 | 2443 goto cleanup; |
| 2444 break; | |
| 973 | 2445 } |
| 2446 } | |
| 2447 | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2448 xunput (c, yytext); |
| 2857 | 2449 return false; |
| 973 | 2450 |
| 3096 | 2451 cleanup: |
| 4051 | 2452 |
| 5765 | 2453 std::string s = buf.str (); |
| 4051 | 2454 |
| 2455 int len = s.length (); | |
| 2456 while (len--) | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2457 xunput (s[len], yytext); |
| 3096 | 2458 |
| 2857 | 2459 return false; |
| 973 | 2460 } |
| 2461 | |
| 1001 | 2462 // We have seen a `.' and need to see if it is the start of a |
| 2463 // continuation. If so, this eats it, up to and including the new | |
| 2464 // line character. | |
| 2465 | |
| 2857 | 2466 static bool |
| 3096 | 2467 have_ellipsis_continuation (bool trailing_comments_ok) |
| 973 | 2468 { |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2469 char c1 = text_yyinput (); |
| 973 | 2470 if (c1 == '.') |
| 2471 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2472 char c2 = text_yyinput (); |
| 1091 | 2473 if (c2 == '.' && have_continuation (trailing_comments_ok)) |
| 2857 | 2474 return true; |
| 973 | 2475 else |
| 2476 { | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2477 xunput (c2, yytext); |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2478 xunput (c1, yytext); |
| 973 | 2479 } |
| 2480 } | |
| 2481 else | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2482 xunput (c1, yytext); |
| 973 | 2483 |
| 2857 | 2484 return false; |
| 973 | 2485 } |
| 2486 | |
| 1001 | 2487 // See if we have a continuation line. If so, eat it and the leading |
| 2488 // whitespace on the next line. | |
| 1088 | 2489 // |
| 2490 // Return value is the same as described for eat_whitespace(). | |
| 1001 | 2491 |
| 1826 | 2492 static yum_yum |
| 1001 | 2493 eat_continuation (void) |
| 2494 { | |
| 1826 | 2495 int retval = ATE_NOTHING; |
| 3665 | 2496 |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2497 int c = text_yyinput (); |
| 3665 | 2498 |
| 1001 | 2499 if ((c == '.' && have_ellipsis_continuation ()) |
| 3105 | 2500 || (c == '\\' && have_continuation ())) |
| 1001 | 2501 retval = eat_whitespace (); |
| 2502 else | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2503 xunput (c, yytext); |
| 1001 | 2504 |
| 2505 return retval; | |
| 2506 } | |
| 2507 | |
| 973 | 2508 static int |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2509 handle_string (char delim) |
| 973 | 2510 { |
| 5765 | 2511 std::ostringstream buf; |
| 973 | 2512 |
| 3805 | 2513 int bos_line = input_line_number; |
| 2514 int bos_col = current_input_column; | |
| 2515 | |
| 973 | 2516 int c; |
| 1031 | 2517 int escape_pending = 0; |
| 973 | 2518 |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2519 while ((c = text_yyinput ()) != EOF) |
| 973 | 2520 { |
| 2521 current_input_column++; | |
| 2522 | |
| 3105 | 2523 if (c == '\\') |
| 973 | 2524 { |
| 5359 | 2525 if (delim == '\'' || escape_pending) |
| 1053 | 2526 { |
| 3802 | 2527 buf << static_cast<char> (c); |
| 1053 | 2528 escape_pending = 0; |
| 2529 } | |
| 2530 else | |
| 2531 { | |
| 3096 | 2532 if (have_continuation (false)) |
| 1053 | 2533 escape_pending = 0; |
| 2534 else | |
| 2535 { | |
| 3802 | 2536 buf << static_cast<char> (c); |
| 1053 | 2537 escape_pending = 1; |
| 2538 } | |
| 2539 } | |
| 1031 | 2540 continue; |
| 973 | 2541 } |
| 2542 else if (c == '.') | |
| 2543 { | |
| 5359 | 2544 if (delim == '\'' || ! have_ellipsis_continuation (false)) |
| 3802 | 2545 buf << static_cast<char> (c); |
| 973 | 2546 } |
| 2547 else if (c == '\n') | |
| 2548 { | |
| 1053 | 2549 error ("unterminated string constant"); |
| 973 | 2550 break; |
| 2551 } | |
| 2552 else if (c == delim) | |
| 2553 { | |
| 1031 | 2554 if (escape_pending) |
| 3802 | 2555 buf << static_cast<char> (c); |
| 973 | 2556 else |
| 2557 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2558 c = text_yyinput (); |
| 973 | 2559 if (c == delim) |
| 5102 | 2560 { |
| 2561 buf << static_cast<char> (c); | |
| 2562 } | |
| 973 | 2563 else |
| 2564 { | |
| 5102 | 2565 std::string s; |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2566 xunput (c, yytext); |
| 5765 | 2567 |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2568 if (delim == '\'') |
| 5765 | 2569 s = buf.str (); |
| 5102 | 2570 else |
| 5765 | 2571 s = do_string_escapes (buf.str ()); |
| 975 | 2572 |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2573 lexer_flags.quote_is_transpose = true; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2574 lexer_flags.convert_spaces_to_comma = true; |
| 975 | 2575 |
| 3805 | 2576 yylval.tok_val = new token (s, bos_line, bos_col); |
| 973 | 2577 token_stack.push (yylval.tok_val); |
| 3400 | 2578 |
| 4037 | 2579 if (delim == '"') |
| 2580 gripe_matlab_incompatible ("\" used as string delimiter"); | |
| 2581 else if (delim == '\'') | |
| 3400 | 2582 gripe_single_quote_string (); |
| 2583 | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
2584 lexer_flags.looking_for_object_index = true; |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2585 lexer_flags.at_beginning_of_statement = false; |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
2586 |
| 5279 | 2587 return delim == '"' ? DQ_STRING : SQ_STRING; |
| 973 | 2588 } |
| 2589 } | |
| 2590 } | |
| 2591 else | |
| 2592 { | |
| 3802 | 2593 buf << static_cast<char> (c); |
| 973 | 2594 } |
| 2595 | |
| 1031 | 2596 escape_pending = 0; |
| 973 | 2597 } |
| 2598 | |
| 2599 return LEXICAL_ERROR; | |
| 2600 } | |
| 2601 | |
| 3208 | 2602 static bool |
| 2603 next_token_is_assign_op (void) | |
| 2604 { | |
| 2605 bool retval = false; | |
| 2606 | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2607 int c0 = text_yyinput (); |
| 3208 | 2608 |
| 2609 switch (c0) | |
| 2610 { | |
| 2611 case '=': | |
| 2612 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2613 int c1 = text_yyinput (); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2614 xunput (c1, yytext); |
| 3208 | 2615 if (c1 != '=') |
| 2616 retval = true; | |
| 2617 } | |
| 2618 break; | |
| 2619 | |
| 2620 case '+': | |
| 2621 case '-': | |
| 2622 case '*': | |
| 2623 case '/': | |
| 2624 case '\\': | |
| 2625 case '&': | |
| 2626 case '|': | |
| 2627 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2628 int c1 = text_yyinput (); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2629 xunput (c1, yytext); |
| 3208 | 2630 if (c1 == '=') |
| 2631 retval = true; | |
| 2632 } | |
| 2633 break; | |
| 2634 | |
| 2635 case '.': | |
| 2636 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2637 int c1 = text_yyinput (); |
| 3208 | 2638 if (match_any (c1, "+-*/\\")) |
| 2639 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2640 int c2 = text_yyinput (); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2641 xunput (c2, yytext); |
| 3208 | 2642 if (c2 == '=') |
| 2643 retval = true; | |
| 2644 } | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2645 xunput (c1, yytext); |
| 3208 | 2646 } |
| 2647 break; | |
| 2648 | |
| 2649 case '>': | |
| 2650 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2651 int c1 = text_yyinput (); |
| 3208 | 2652 if (c1 == '>') |
| 2653 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2654 int c2 = text_yyinput (); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2655 xunput (c2, yytext); |
| 3208 | 2656 if (c2 == '=') |
| 2657 retval = true; | |
| 2658 } | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2659 xunput (c1, yytext); |
| 3208 | 2660 } |
| 2661 break; | |
| 2662 | |
| 2663 case '<': | |
| 2664 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2665 int c1 = text_yyinput (); |
| 3208 | 2666 if (c1 == '<') |
| 2667 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2668 int c2 = text_yyinput (); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2669 xunput (c2, yytext); |
| 3208 | 2670 if (c2 == '=') |
| 2671 retval = true; | |
| 2672 } | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2673 xunput (c1, yytext); |
| 3208 | 2674 } |
| 2675 break; | |
| 2676 | |
| 2677 default: | |
| 2678 break; | |
| 2679 } | |
| 2680 | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2681 xunput (c0, yytext); |
| 3208 | 2682 |
| 2683 return retval; | |
| 2684 } | |
| 2685 | |
| 4633 | 2686 static bool |
| 2687 next_token_is_index_op (void) | |
| 2688 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2689 int c = text_yyinput (); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2690 xunput (c, yytext); |
| 4633 | 2691 return c == '(' || c == '{'; |
| 2692 } | |
| 2693 | |
| 4612 | 2694 static int |
| 2695 handle_close_bracket (bool spc_gobbled, int bracket_type) | |
| 971 | 2696 { |
| 4612 | 2697 int retval = bracket_type; |
| 3208 | 2698 |
| 1826 | 2699 if (! nesting_level.none ()) |
| 971 | 2700 { |
| 1826 | 2701 nesting_level.remove (); |
| 4613 | 2702 |
| 2703 if (bracket_type == ']') | |
| 2704 lexer_flags.bracketflag--; | |
| 2705 else if (bracket_type == '}') | |
| 2706 lexer_flags.braceflag--; | |
| 2707 else | |
| 2708 panic_impossible (); | |
| 971 | 2709 } |
| 2710 | |
| 4613 | 2711 if (lexer_flags.bracketflag == 0 && lexer_flags.braceflag == 0) |
| 4323 | 2712 BEGIN (INITIAL); |
| 1001 | 2713 |
| 4608 | 2714 if (bracket_type == ']' |
| 2715 && next_token_is_assign_op () | |
| 2716 && ! lexer_flags.looking_at_return_list) | |
| 971 | 2717 { |
| 3208 | 2718 retval = CLOSE_BRACE; |
| 971 | 2719 } |
| 4613 | 2720 else if ((lexer_flags.bracketflag || lexer_flags.braceflag) |
| 2721 && lexer_flags.convert_spaces_to_comma | |
| 2722 && (nesting_level.is_bracket () | |
| 2723 || (nesting_level.is_brace () | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
2724 && ! lexer_flags.looking_at_object_index.front ()))) |
| 971 | 2725 { |
| 4633 | 2726 bool index_op = next_token_is_index_op (); |
| 2727 | |
| 2728 // Don't insert comma if we are looking at something like | |
| 2729 // | |
| 2730 // [x{i}{j}] or [x{i}(j)] | |
| 2731 // | |
| 2732 // but do if we are looking at | |
| 2733 // | |
| 2734 // [x{i} {j}] or [x{i} (j)] | |
| 2735 | |
| 2736 if (spc_gobbled || ! (bracket_type == '}' && index_op)) | |
| 971 | 2737 { |
| 4633 | 2738 bool bin_op = next_token_is_bin_op (spc_gobbled); |
| 2739 | |
| 2740 bool postfix_un_op = next_token_is_postfix_unary_op (spc_gobbled); | |
| 2741 | |
| 2742 bool sep_op = next_token_is_sep_op (); | |
| 2743 | |
| 2744 if (! (postfix_un_op || bin_op || sep_op)) | |
| 2745 { | |
| 2746 maybe_warn_separator_insert (','); | |
| 2747 | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
2748 xunput (',', yytext); |
| 4633 | 2749 return retval; |
| 2750 } | |
| 971 | 2751 } |
| 2752 } | |
| 2753 | |
| 2857 | 2754 lexer_flags.quote_is_transpose = true; |
| 2755 lexer_flags.convert_spaces_to_comma = true; | |
| 3208 | 2756 |
| 2757 return retval; | |
| 971 | 2758 } |
| 2759 | |
| 1072 | 2760 static void |
| 2761 maybe_unput_comma (int spc_gobbled) | |
| 2762 { | |
| 4613 | 2763 if (nesting_level.is_bracket () |
| 2764 || (nesting_level.is_brace () | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
2765 && ! lexer_flags.looking_at_object_index.front ())) |
| 1072 | 2766 { |
| 3246 | 2767 int bin_op = next_token_is_bin_op (spc_gobbled); |
| 1072 | 2768 |
| 3246 | 2769 int postfix_un_op = next_token_is_postfix_unary_op (spc_gobbled); |
| 1072 | 2770 |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2771 int c1 = text_yyinput (); |
|
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
2772 int c2 = text_yyinput (); |
| 2970 | 2773 |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2774 xunput (c2, yytext); |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
2775 xunput (c1, yytext); |
| 2970 | 2776 |
| 3263 | 2777 int sep_op = next_token_is_sep_op (); |
| 2970 | 2778 |
| 1072 | 2779 int dot_op = (c1 == '.' |
| 2780 && (isalpha (c2) || isspace (c2) || c2 == '_')); | |
| 2970 | 2781 |
| 3388 | 2782 if (postfix_un_op || bin_op || sep_op || dot_op) |
| 2783 return; | |
| 2784 | |
| 3985 | 2785 int index_op = (c1 == '(' || c1 == '{'); |
| 3388 | 2786 |
| 4476 | 2787 // If there is no space before the indexing op, we don't insert |
| 2788 // a comma. | |
| 2789 | |
| 2790 if (index_op && ! spc_gobbled) | |
| 2791 return; | |
| 2792 | |
| 2793 maybe_warn_separator_insert (','); | |
| 2794 | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
2795 xunput (',', yytext); |
| 1072 | 2796 } |
| 2797 } | |
| 2798 | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2799 static bool |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2800 next_token_can_follow_bin_op (void) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2801 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2802 std::stack<char> buf; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2803 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2804 int c = EOF; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2805 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2806 // Skip whitespace in current statement on current line |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2807 while (true) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2808 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2809 c = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2810 |
|
8767
026c6732ec7a
lex.l (next_token_can_follow_bin_op): push all characters read on to buffer stack
John W. Eaton <jwe@octave.org>
parents:
8746
diff
changeset
|
2811 buf.push (c); |
|
026c6732ec7a
lex.l (next_token_can_follow_bin_op): push all characters read on to buffer stack
John W. Eaton <jwe@octave.org>
parents:
8746
diff
changeset
|
2812 |
|
026c6732ec7a
lex.l (next_token_can_follow_bin_op): push all characters read on to buffer stack
John W. Eaton <jwe@octave.org>
parents:
8746
diff
changeset
|
2813 if (match_any (c, ",;\n") || (c != ' ' && c != '\t')) |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2814 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2815 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2816 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2817 // Restore input. |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2818 while (! buf.empty ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2819 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2820 xunput (buf.top (), yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2821 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2822 buf.pop (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2823 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2824 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2825 return (isalnum (c) || match_any (c, "!\"'(-[_{~")); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2826 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2827 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2828 static bool |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2829 looks_like_command_arg (void) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2830 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2831 bool retval = true; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2832 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2833 int c0 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2834 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2835 switch (c0) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2836 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2837 // = == |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2838 case '=': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2839 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2840 int c1 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2841 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2842 if (c1 == '=') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2843 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2844 int c2 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2845 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2846 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2847 && next_token_can_follow_bin_op ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2848 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2849 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2850 xunput (c2, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2851 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2852 else |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2853 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2854 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2855 xunput (c1, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2856 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2857 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2858 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2859 case '(': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2860 case '{': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2861 // Indexing. |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2862 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2863 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2864 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2865 case '\n': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2866 // EOL. |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2867 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2868 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2869 case '\'': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2870 case '"': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2871 // Beginning of a character string. |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2872 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2873 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2874 // + - ++ -- += -= |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2875 case '+': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2876 case '-': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2877 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2878 int c1 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2879 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2880 switch (c1) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2881 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2882 case '\n': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2883 // EOL. |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2884 case '+': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2885 case '-': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2886 // Unary ops, spacing doesn't matter. |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2887 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2888 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2889 case '\t': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2890 case ' ': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2891 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2892 if (next_token_can_follow_bin_op ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2893 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2894 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2895 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2896 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2897 case '=': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2898 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2899 int c2 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2900 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2901 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2902 && next_token_can_follow_bin_op ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2903 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2904 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2905 xunput (c2, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2906 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2907 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2908 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2909 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2910 xunput (c1, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2911 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2912 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2913 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2914 case ':': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2915 case '/': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2916 case '\\': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2917 case '^': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2918 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2919 int c1 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2920 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2921 if (! match_any (c1, ",;\n") && (c1 == ' ' || c1 == '\t') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2922 && next_token_can_follow_bin_op ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2923 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2924 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2925 xunput (c1, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2926 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2927 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2928 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2929 // .+ .- ./ .\ .^ .* .** |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2930 case '.': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2931 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2932 int c1 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2933 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2934 if (match_any (c1, "+-/\\^*")) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2935 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2936 int c2 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2937 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2938 if (c2 == '=') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2939 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2940 int c3 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2941 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2942 if (! match_any (c3, ",;\n") && (c3 == ' ' || c3 == '\t') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2943 && next_token_can_follow_bin_op ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2944 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2945 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2946 xunput (c3, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2947 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2948 else if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2949 && next_token_can_follow_bin_op ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2950 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2951 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2952 xunput (c2, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2953 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2954 else if (! match_any (c1, ",;\n") |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2955 && (! isdigit (c1) && c1 != ' ' && c1 != '\t' |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2956 && c1 != '.')) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2957 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2958 // Structure reference. FIXME -- is this a complete check? |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2959 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2960 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2961 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2962 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2963 xunput (c1, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2964 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2965 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2966 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2967 // & && | || * ** |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2968 case '&': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2969 case '|': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2970 case '*': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2971 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2972 int c1 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2973 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2974 if (c1 == c0) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2975 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2976 int c2 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2977 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2978 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2979 && next_token_can_follow_bin_op ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2980 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2981 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2982 xunput (c2, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2983 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2984 else if (! match_any (c1, ",;\n") && (c1 == ' ' || c1 == '\t') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2985 && next_token_can_follow_bin_op ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2986 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2987 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2988 xunput (c1, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2989 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2990 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2991 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2992 // < <= > >= |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2993 case '<': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2994 case '>': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2995 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2996 int c1 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2997 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2998 if (c1 == '=') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
2999 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3000 int c2 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3001 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3002 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3003 && next_token_can_follow_bin_op ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3004 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3005 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3006 xunput (c2, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3007 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3008 else if (! match_any (c1, ",;\n") && (c1 == ' ' || c1 == '\t') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3009 && next_token_can_follow_bin_op ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3010 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3011 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3012 xunput (c1, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3013 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3014 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3015 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3016 // ~= != |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3017 case '~': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3018 case '!': |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3019 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3020 int c1 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3021 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3022 // ~ and ! can be unary ops, so require following =. |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3023 if (c1 == '=') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3024 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3025 int c2 = text_yyinput (); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3026 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3027 if (! match_any (c2, ",;\n") && (c2 == ' ' || c2 == '\t') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3028 && next_token_can_follow_bin_op ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3029 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3030 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3031 xunput (c2, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3032 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3033 else if (! match_any (c1, ",;\n") && (c1 == ' ' || c1 == '\t') |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3034 && next_token_can_follow_bin_op ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3035 retval = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3036 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3037 xunput (c1, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3038 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3039 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3040 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3041 default: |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3042 break; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3043 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3044 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3045 xunput (c0, yytext); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3046 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3047 return retval; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3048 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3049 |
| 9476 | 3050 static int |
| 3051 handle_superclass_identifier (void) | |
| 3052 { | |
| 3053 eat_continuation (); | |
| 3054 | |
| 3055 std::string pkg; | |
| 3056 std::string meth = strip_trailing_whitespace (yytext); | |
| 3057 size_t pos = meth.find ("@"); | |
| 3058 std::string cls = meth.substr (pos).substr (1); | |
| 3059 meth = meth.substr (0, pos - 1); | |
| 3060 | |
| 3061 pos = cls.find ("."); | |
| 3062 if (pos != std::string::npos) | |
| 3063 { | |
| 3064 pkg = cls.substr (pos).substr (1); | |
| 3065 cls = cls.substr (0, pos - 1); | |
| 3066 } | |
| 3067 | |
| 3068 int kw_token = (is_keyword_token (meth) || is_keyword_token (cls) | |
| 3069 || is_keyword_token (pkg)); | |
| 3070 if (kw_token) | |
| 3071 { | |
| 3072 error ("method, class and package names may not be keywords"); | |
| 3073 return LEXICAL_ERROR; | |
| 3074 } | |
| 3075 | |
| 3076 yylval.tok_val | |
| 3077 = new token (meth.empty () ? 0 : &(symbol_table::insert (meth)), | |
| 3078 cls.empty () ? 0 : &(symbol_table::insert (cls)), | |
| 3079 pkg.empty () ? 0 : &(symbol_table::insert (pkg)), | |
| 3080 input_line_number, current_input_column); | |
| 3081 token_stack.push (yylval.tok_val); | |
| 3082 | |
| 3083 lexer_flags.convert_spaces_to_comma = true; | |
| 3084 current_input_column += yyleng; | |
| 3085 | |
| 3086 return SUPERCLASSREF; | |
| 3087 } | |
| 3088 | |
| 3089 static int | |
| 3090 handle_meta_identifier (void) | |
| 3091 { | |
| 3092 eat_continuation (); | |
| 3093 | |
| 3094 std::string pkg; | |
| 3095 std::string cls = strip_trailing_whitespace (yytext).substr (1); | |
| 3096 size_t pos = cls.find ("."); | |
| 3097 | |
| 3098 if (pos != std::string::npos) | |
| 3099 { | |
| 3100 pkg = cls.substr (pos).substr (1); | |
| 3101 cls = cls.substr (0, pos - 1); | |
| 3102 } | |
| 3103 | |
| 3104 int kw_token = is_keyword_token (cls) || is_keyword_token (pkg); | |
| 3105 if (kw_token) | |
| 3106 { | |
| 3107 error ("class and package names may not be keywords"); | |
| 3108 return LEXICAL_ERROR; | |
| 3109 } | |
| 3110 | |
| 3111 yylval.tok_val | |
| 3112 = new token (cls.empty () ? 0 : &(symbol_table::insert (cls)), | |
| 3113 pkg.empty () ? 0 : &(symbol_table::insert (pkg)), | |
| 3114 input_line_number, current_input_column); | |
| 3115 | |
| 3116 token_stack.push (yylval.tok_val); | |
| 3117 | |
| 3118 lexer_flags.convert_spaces_to_comma = true; | |
| 3119 current_input_column += yyleng; | |
| 3120 | |
| 3121 return METAQUERY; | |
| 3122 } | |
| 3123 | |
| 767 | 3124 // Figure out exactly what kind of token to return when we have seen |
| 4238 | 3125 // an identifier. Handles keywords. Return -1 if the identifier |
| 3126 // should be ignored. | |
| 767 | 3127 |
| 146 | 3128 static int |
| 3974 | 3129 handle_identifier (void) |
| 146 | 3130 { |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3131 bool at_bos = lexer_flags.at_beginning_of_statement; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3132 |
| 3974 | 3133 std::string tok = strip_trailing_whitespace (yytext); |
| 3134 | |
| 3135 int c = yytext[yyleng-1]; | |
| 3136 | |
| 3137 int cont_is_spc = eat_continuation (); | |
| 3138 | |
| 3139 int spc_gobbled = (cont_is_spc || c == ' ' || c == '\t'); | |
| 3140 | |
| 2970 | 3141 // If we are expecting a structure element, avoid recognizing |
| 3142 // keywords and other special names and return STRUCT_ELT, which is | |
| 3143 // a string that is also a valid identifier. But first, we have to | |
| 3144 // decide whether to insert a comma. | |
| 747 | 3145 |
| 1826 | 3146 if (lexer_flags.looking_at_indirect_ref) |
| 1072 | 3147 { |
| 2970 | 3148 do_comma_insert_check (); |
| 3149 | |
| 1072 | 3150 maybe_unput_comma (spc_gobbled); |
| 2819 | 3151 |
| 3152 yylval.tok_val = new token (tok, input_line_number, | |
| 3153 current_input_column); | |
| 3154 | |
| 3155 token_stack.push (yylval.tok_val); | |
| 3156 | |
| 2857 | 3157 lexer_flags.quote_is_transpose = true; |
| 3158 lexer_flags.convert_spaces_to_comma = true; | |
|
9324
29563379fa9b
don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
3159 lexer_flags.looking_for_object_index = true; |
| 2819 | 3160 |
| 3161 current_input_column += yyleng; | |
| 3162 | |
| 2970 | 3163 return STRUCT_ELT; |
| 1072 | 3164 } |
| 747 | 3165 |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3166 lexer_flags.at_beginning_of_statement = false; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3167 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3168 // The is_keyword_token may reset |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3169 // lexer_flags.at_beginning_of_statement. For example, if it sees |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3170 // an else token, then the next token is at the beginning of a |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3171 // statement. |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3172 |
| 4930 | 3173 int kw_token = is_keyword_token (tok); |
| 3174 | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3175 // If we found a keyword token, then the beginning_of_statement flag |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3176 // is already set. Otherwise, we won't be at the beginning of a |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3177 // statement. |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3178 |
| 4930 | 3179 if (lexer_flags.looking_at_function_handle) |
| 3180 { | |
| 3181 if (kw_token) | |
| 3182 { | |
| 3183 error ("function handles may not refer to keywords"); | |
| 3184 | |
| 3185 return LEXICAL_ERROR; | |
| 3186 } | |
| 3187 else | |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3188 { |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3189 yylval.tok_val = new token (tok, input_line_number, |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3190 current_input_column); |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3191 |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3192 token_stack.push (yylval.tok_val); |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3193 |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3194 current_input_column += yyleng; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3195 lexer_flags.quote_is_transpose = false; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3196 lexer_flags.convert_spaces_to_comma = true; |
|
9324
29563379fa9b
don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
3197 lexer_flags.looking_for_object_index = true; |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3198 |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3199 return FCN_HANDLE; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3200 } |
| 4930 | 3201 } |
| 3202 | |
| 5102 | 3203 // If we have a regular keyword, return it. |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3204 // Keywords can be followed by identifiers. |
| 146 | 3205 |
| 3206 if (kw_token) | |
| 3207 { | |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3208 if (kw_token >= 0) |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3209 { |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3210 current_input_column += yyleng; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3211 lexer_flags.quote_is_transpose = false; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3212 lexer_flags.convert_spaces_to_comma = true; |
|
9324
29563379fa9b
don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
3213 lexer_flags.looking_for_object_index = false; |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3214 } |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3215 |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3216 return kw_token; |
| 146 | 3217 } |
| 3218 | |
| 1826 | 3219 // See if we have a plot keyword (title, using, with, or clear). |
| 146 | 3220 |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
3221 int c1 = text_yyinput (); |
| 3480 | 3222 |
| 3223 bool next_tok_is_eq = false; | |
| 3224 if (c1 == '=') | |
| 3225 { | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
3226 int c2 = text_yyinput (); |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
3227 xunput (c2, yytext); |
| 3480 | 3228 |
| 3229 if (c2 != '=') | |
| 3230 next_tok_is_eq = true; | |
| 3231 } | |
| 3232 | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8312
diff
changeset
|
3233 xunput (c1, yytext); |
| 1001 | 3234 |
| 2702 | 3235 // Kluge alert. |
| 3236 // | |
| 3237 // If we are looking at a text style function, set up to gobble its | |
| 2745 | 3238 // arguments. |
| 3239 // | |
| 3240 // If the following token is `=', or if we are parsing a function | |
| 3189 | 3241 // return list or function parameter list, or if we are looking at |
| 3242 // something like [ab,cd] = foo (), force the symbol to be inserted | |
| 3243 // as a variable in the current symbol table. | |
| 2702 | 3244 |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3245 if (! is_variable (tok)) |
| 2702 | 3246 { |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3247 if (at_bos && spc_gobbled && looks_like_command_arg ()) |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3248 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3249 BEGIN (COMMAND_START); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3250 } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3251 else if (next_tok_is_eq |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3252 || lexer_flags.looking_at_decl_list |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3253 || lexer_flags.looking_at_return_list |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3254 || (lexer_flags.looking_at_parameter_list |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3255 && ! lexer_flags.looking_at_initializer_expression)) |
| 2745 | 3256 { |
|
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
3257 symbol_table::force_variable (tok); |
| 2745 | 3258 } |
|
8001
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7898
diff
changeset
|
3259 else if (lexer_flags.looking_at_matrix_or_assign_lhs) |
|
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7898
diff
changeset
|
3260 { |
|
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7898
diff
changeset
|
3261 lexer_flags.pending_local_variables.insert (tok); |
|
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7898
diff
changeset
|
3262 } |
| 2702 | 3263 } |
| 3264 | |
| 4234 | 3265 // Find the token in the symbol table. Beware the magic |
| 3266 // transformation of the end keyword... | |
| 3267 | |
| 3268 if (tok == "end") | |
| 3269 tok = "__end__"; | |
| 146 | 3270 |
| 7336 | 3271 yylval.tok_val = new token (&(symbol_table::insert (tok)), |
| 3272 input_line_number, current_input_column); | |
| 3273 | |
| 146 | 3274 token_stack.push (yylval.tok_val); |
| 3275 | |
| 1826 | 3276 // After seeing an identifer, it is ok to convert spaces to a comma |
| 3277 // (if needed). | |
| 146 | 3278 |
| 2857 | 3279 lexer_flags.convert_spaces_to_comma = true; |
| 146 | 3280 |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3281 if (! (next_tok_is_eq || YY_START == COMMAND_START)) |
| 2877 | 3282 { |
| 3283 lexer_flags.quote_is_transpose = true; | |
| 146 | 3284 |
| 2877 | 3285 do_comma_insert_check (); |
| 3286 | |
| 3287 maybe_unput_comma (spc_gobbled); | |
| 146 | 3288 } |
| 3289 | |
| 2877 | 3290 current_input_column += yyleng; |
| 146 | 3291 |
|
9324
29563379fa9b
don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
3292 if (tok != "__end__") |
|
29563379fa9b
don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
3293 lexer_flags.looking_for_object_index = true; |
|
29563379fa9b
don't look for object index after keyword
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
3294 |
| 146 | 3295 return NAME; |
| 3296 } | |
| 3297 | |
| 1826 | 3298 void |
| 3299 lexical_feedback::init (void) | |
| 3300 { | |
| 3301 // Not initially defining a matrix list. | |
| 3351 | 3302 bracketflag = 0; |
| 1826 | 3303 |
| 4613 | 3304 // Not initially defining a cell array list. |
| 3305 braceflag = 0; | |
| 3306 | |
| 1826 | 3307 // Not initially inside a loop or if statement. |
| 3308 looping = 0; | |
| 3309 | |
| 2857 | 3310 // Not initially defining a function. |
| 3311 defining_func = false; | |
| 2877 | 3312 parsed_function_name = false; |
| 7336 | 3313 parsing_class_method = false; |
| 9476 | 3314 |
| 3315 // Not initially defining a class with classdef. | |
| 3316 maybe_classdef_get_set_method = false; | |
| 3317 parsing_classdef = false; | |
| 2857 | 3318 |
| 4930 | 3319 // Not initiallly looking at a function handle. |
| 3320 looking_at_function_handle = 0; | |
| 3321 | |
|
8701
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8537
diff
changeset
|
3322 // Not parsing a function return, parameter, or declaration list. |
| 2857 | 3323 looking_at_return_list = false; |
| 3324 looking_at_parameter_list = false; | |
|
8701
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8537
diff
changeset
|
3325 looking_at_decl_list = false; |
| 2857 | 3326 |
|
7634
ae90e05ad299
fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
3327 // Not looking at an argument list initializer expression. |
|
ae90e05ad299
fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
3328 looking_at_initializer_expression = false; |
|
ae90e05ad299
fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
3329 |
| 3796 | 3330 // Not parsing a matrix or the left hand side of multi-value |
| 3331 // assignment statement. | |
| 3332 looking_at_matrix_or_assign_lhs = false; | |
| 3333 | |
| 4234 | 3334 // Not parsing an object index. |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
3335 while (! looking_at_object_index.empty ()) |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
3336 looking_at_object_index.pop_front (); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
3337 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
3338 looking_at_object_index.push_front (false); |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
3339 |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
3340 // Object index not possible until we've seen something. |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
3341 looking_for_object_index = false; |
| 4234 | 3342 |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3343 // Yes, we are at the beginning of a statement. |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3344 at_beginning_of_statement = true; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3345 |
| 2857 | 3346 // No need to do comma insert or convert spaces to comma at |
| 3347 // beginning of input. | |
| 3348 convert_spaces_to_comma = true; | |
| 3349 do_comma_insert = false; | |
| 3350 | |
| 1826 | 3351 // Not initially looking at indirect references. |
| 2857 | 3352 looking_at_indirect_ref = false; |
| 1826 | 3353 |
| 3354 // Quote marks strings intially. | |
| 2857 | 3355 quote_is_transpose = false; |
|
8001
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7898
diff
changeset
|
3356 |
|
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7898
diff
changeset
|
3357 // Set of identifiers that might be local variable names is empty. |
|
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7898
diff
changeset
|
3358 pending_local_variables.clear (); |
| 1826 | 3359 } |
| 3360 | |
| 4867 | 3361 bool |
| 3362 is_keyword (const std::string& s) | |
| 3363 { | |
| 5088 | 3364 return octave_kw_hash::in_word_set (s.c_str (), s.length ()) != 0; |
| 4867 | 3365 } |
| 3366 | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3367 DEFUN (iskeyword, args, , |
| 4264 | 3368 "-*- texinfo -*-\n\ |
| 3369 @deftypefn {Built-in Function} {} iskeyword (@var{name})\n\ | |
| 3370 Return true if @var{name} is an Octave keyword. If @var{name}\n\ | |
| 3371 is omitted, return a list of keywords.\n\ | |
| 3372 @end deftypefn") | |
| 3373 { | |
| 3374 octave_value retval; | |
| 3375 | |
| 3376 int argc = args.length () + 1; | |
| 3377 | |
| 4867 | 3378 string_vector argv = args.make_argv ("iskeyword"); |
| 4264 | 3379 |
| 3380 if (error_state) | |
| 3381 return retval; | |
| 3382 | |
| 3383 if (argc == 1) | |
| 3384 { | |
| 3385 string_vector lst (TOTAL_KEYWORDS); | |
| 3386 | |
| 3387 for (int i = 0; i < TOTAL_KEYWORDS; i++) | |
| 3388 lst[i] = wordlist[i].name; | |
| 3389 | |
|
8504
0e0bd07e6ae2
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
8447
diff
changeset
|
3390 retval = Cell (lst.sort ()); |
| 4264 | 3391 } |
| 3392 else if (argc == 2) | |
| 3393 { | |
| 4867 | 3394 retval = is_keyword (argv[1]); |
| 4264 | 3395 } |
| 3396 else | |
| 5823 | 3397 print_usage (); |
| 4264 | 3398 |
| 3399 return retval; | |
| 3400 } | |
| 3401 | |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
3402 void |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
3403 prep_lexer_for_script_file (void) |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
3404 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
3405 BEGIN (SCRIPT_FILE_BEGIN); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
3406 } |
| 4264 | 3407 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
3408 void |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
3409 prep_lexer_for_function_file (void) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
3410 { |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
3411 BEGIN (FUNCTION_FILE_BEGIN); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
3412 } |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
3413 |
| 3388 | 3414 static void |
| 3415 maybe_warn_separator_insert (char sep) | |
| 3416 { | |
| 3523 | 3417 std::string nm = curr_fcn_file_full_name; |
| 3388 | 3418 |
| 5794 | 3419 if (nm.empty ()) |
| 3420 warning_with_id ("Octave:separator-insert", | |
| 3421 "potential auto-insertion of `%c' near line %d", | |
| 3422 sep, input_line_number); | |
| 3423 else | |
| 3424 warning_with_id ("Octave:separator-insert", | |
| 3425 "potential auto-insertion of `%c' near line %d of file %s", | |
| 3426 sep, input_line_number, nm.c_str ()); | |
| 3388 | 3427 } |
| 3428 | |
| 3400 | 3429 static void |
| 3430 gripe_single_quote_string (void) | |
| 3431 { | |
| 3523 | 3432 std::string nm = curr_fcn_file_full_name; |
| 3400 | 3433 |
| 5794 | 3434 if (nm.empty ()) |
| 3435 warning_with_id ("Octave:single-quote-string", | |
| 3436 "single quote delimited string near line %d", | |
| 3437 input_line_number); | |
| 3438 else | |
| 3439 warning_with_id ("Octave:single-quote-string", | |
| 3440 "single quote delimited string near line %d of file %s", | |
| 3441 input_line_number, nm.c_str ()); | |
| 3400 | 3442 } |
| 3443 | |
| 4037 | 3444 static void |
| 3445 gripe_matlab_incompatible (const std::string& msg) | |
| 3446 { | |
|
8974
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
3447 std::string nm = curr_fcn_file_full_name; |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
3448 |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
3449 if (nm.empty ()) |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
3450 warning_with_id ("Octave:matlab-incompatible", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
3451 "potential Matlab compatibility problem: %s", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
3452 msg.c_str ()); |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
3453 else |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
3454 warning_with_id ("Octave:matlab-incompatible", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
3455 "potential Matlab compatibility problem: %s near line %d offile %s", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
3456 msg.c_str (), input_line_number, nm.c_str ()); |
| 4037 | 3457 } |
| 3458 | |
| 3459 static void | |
| 3460 maybe_gripe_matlab_incompatible_comment (char c) | |
| 3461 { | |
| 3462 if (c == '#') | |
| 3463 gripe_matlab_incompatible ("# used as comment character"); | |
| 3464 } | |
| 3465 | |
| 3466 static void | |
| 3467 gripe_matlab_incompatible_continuation (void) | |
| 3468 { | |
| 3469 gripe_matlab_incompatible ("\\ used as line continuation marker"); | |
| 3470 } | |
| 3471 | |
| 3472 static void | |
| 3473 gripe_matlab_incompatible_operator (const std::string& op) | |
| 3474 { | |
| 3475 std::string t = op; | |
| 3476 int n = t.length (); | |
| 3477 if (t[n-1] == '\n') | |
| 3478 t.resize (n-1); | |
| 3479 gripe_matlab_incompatible (t + " used as operator"); | |
| 3480 } | |
| 3481 | |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3482 static void |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3483 display_token (int tok) |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3484 { |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3485 switch (tok) |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3486 { |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3487 case '=': std::cerr << "'='\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3488 case ':': std::cerr << "':'\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3489 case '-': std::cerr << "'-'\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3490 case '+': std::cerr << "'+'\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3491 case '*': std::cerr << "'*'\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3492 case '/': std::cerr << "'/'\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3493 case ADD_EQ: std::cerr << "ADD_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3494 case SUB_EQ: std::cerr << "SUB_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3495 case MUL_EQ: std::cerr << "MUL_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3496 case DIV_EQ: std::cerr << "DIV_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3497 case LEFTDIV_EQ: std::cerr << "LEFTDIV_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3498 case POW_EQ: std::cerr << "POW_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3499 case EMUL_EQ: std::cerr << "EMUL_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3500 case EDIV_EQ: std::cerr << "EDIV_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3501 case ELEFTDIV_EQ: std::cerr << "ELEFTDIV_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3502 case EPOW_EQ: std::cerr << "EPOW_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3503 case AND_EQ: std::cerr << "AND_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3504 case OR_EQ: std::cerr << "OR_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3505 case LSHIFT_EQ: std::cerr << "LSHIFT_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3506 case RSHIFT_EQ: std::cerr << "RSHIFT_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3507 case LSHIFT: std::cerr << "LSHIFT\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3508 case RSHIFT: std::cerr << "RSHIFT\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3509 case EXPR_AND_AND: std::cerr << "EXPR_AND_AND\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3510 case EXPR_OR_OR: std::cerr << "EXPR_OR_OR\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3511 case EXPR_AND: std::cerr << "EXPR_AND\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3512 case EXPR_OR: std::cerr << "EXPR_OR\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3513 case EXPR_NOT: std::cerr << "EXPR_NOT\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3514 case EXPR_LT: std::cerr << "EXPR_LT\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3515 case EXPR_LE: std::cerr << "EXPR_LE\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3516 case EXPR_EQ: std::cerr << "EXPR_EQ\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3517 case EXPR_NE: std::cerr << "EXPR_NE\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3518 case EXPR_GE: std::cerr << "EXPR_GE\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3519 case EXPR_GT: std::cerr << "EXPR_GT\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3520 case LEFTDIV: std::cerr << "LEFTDIV\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3521 case EMUL: std::cerr << "EMUL\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3522 case EDIV: std::cerr << "EDIV\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3523 case ELEFTDIV: std::cerr << "ELEFTDIV\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3524 case EPLUS: std::cerr << "EPLUS\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3525 case EMINUS: std::cerr << "EMINUS\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3526 case QUOTE: std::cerr << "QUOTE\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3527 case TRANSPOSE: std::cerr << "TRANSPOSE\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3528 case PLUS_PLUS: std::cerr << "PLUS_PLUS\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3529 case MINUS_MINUS: std::cerr << "MINUS_MINUS\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3530 case POW: std::cerr << "POW\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3531 case EPOW: std::cerr << "EPOW\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3532 case NUM: std::cerr << "NUM\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3533 case IMAG_NUM: std::cerr << "IMAG_NUM\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3534 case STRUCT_ELT: std::cerr << "STRUCT_ELT\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3535 case NAME: std::cerr << "NAME\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3536 case END: std::cerr << "END\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3537 case DQ_STRING: std::cerr << "DQ_STRING\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3538 case SQ_STRING: std::cerr << "SQ_STRING\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3539 case FOR: std::cerr << "FOR\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3540 case WHILE: std::cerr << "WHILE\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3541 case DO: std::cerr << "DO\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3542 case UNTIL: std::cerr << "UNTIL\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3543 case IF: std::cerr << "IF\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3544 case ELSEIF: std::cerr << "ELSEIF\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3545 case ELSE: std::cerr << "ELSE\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3546 case SWITCH: std::cerr << "SWITCH\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3547 case CASE: std::cerr << "CASE\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3548 case OTHERWISE: std::cerr << "OTHERWISE\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3549 case BREAK: std::cerr << "BREAK\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3550 case CONTINUE: std::cerr << "CONTINUE\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3551 case FUNC_RET: std::cerr << "FUNC_RET\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3552 case UNWIND: std::cerr << "UNWIND\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3553 case CLEANUP: std::cerr << "CLEANUP\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3554 case TRY: std::cerr << "TRY\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3555 case CATCH: std::cerr << "CATCH\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3556 case GLOBAL: std::cerr << "GLOBAL\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3557 case STATIC: std::cerr << "STATIC\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3558 case FCN_HANDLE: std::cerr << "FCN_HANDLE\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3559 case END_OF_INPUT: std::cerr << "END_OF_INPUT\n\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3560 case LEXICAL_ERROR: std::cerr << "LEXICAL_ERROR\n\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3561 case FCN: std::cerr << "FCN\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3562 case CLOSE_BRACE: std::cerr << "CLOSE_BRACE\n"; break; |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
3563 case SCRIPT_FILE: std::cerr << "SCRIPT_FILE\n"; break; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
3564 case FUNCTION_FILE: std::cerr << "FUNCTION_FILE\n"; break; |
| 9476 | 3565 case SUPERCLASSREF: std::cerr << "SUPERCLASSREF\n"; break; |
| 3566 case METAQUERY: std::cerr << "METAQUERY\n"; break; | |
| 3567 case GET: std::cerr << "GET\n"; break; | |
| 3568 case SET: std::cerr << "SET\n"; break; | |
| 3569 case PROPERTIES: std::cerr << "PROPERTIES\n"; break; | |
| 3570 case METHODS: std::cerr << "METHODS\n"; break; | |
| 3571 case EVENTS: std::cerr << "EVENTS\n"; break; | |
| 3572 case CLASSDEF: std::cerr << "CLASSDEF\n"; break; | |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3573 case '\n': std::cerr << "\\n\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3574 case '\r': std::cerr << "\\r\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3575 case '\t': std::cerr << "TAB\n"; break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3576 default: |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3577 { |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3578 if (tok < 256) |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3579 std::cerr << static_cast<char> (tok) << "\n"; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3580 else |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3581 std::cerr << "UNKNOWN(" << tok << ")\n"; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3582 } |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3583 break; |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3584 } |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3585 } |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3586 |
| 8535 | 3587 static void |
| 3588 display_state (void) | |
| 3589 { | |
| 3590 std::cerr << "S: "; | |
| 3591 | |
| 3592 switch (YY_START) | |
| 3593 { | |
| 3594 case INITIAL: | |
| 3595 std::cerr << "INITIAL" << std::endl; | |
| 3596 break; | |
| 3597 | |
| 3598 case COMMAND_START: | |
| 3599 std::cerr << "COMMAND_START" << std::endl; | |
| 3600 break; | |
| 3601 | |
| 3602 case MATRIX_START: | |
| 3603 std::cerr << "MATRIX_START" << std::endl; | |
| 3604 break; | |
| 3605 | |
| 3606 case SCRIPT_FILE_BEGIN: | |
| 3607 std::cerr << "SCRIPT_FILE_BEGIN" << std::endl; | |
| 3608 break; | |
| 3609 | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
3610 case FUNCTION_FILE_BEGIN: |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9324
diff
changeset
|
3611 std::cerr << "FUNCTION_FILE_BEGIN" << std::endl; |
| 8535 | 3612 break; |
| 3613 | |
| 3614 default: | |
| 3615 std::cerr << "UNKNOWN START STATE!" << std::endl; | |
| 3616 break; | |
| 3617 } | |
| 3618 } | |
| 3619 | |
| 3620 static void | |
| 3621 lexer_debug (const char *pattern, const char *text) | |
| 3622 { | |
| 3623 std::cerr << std::endl; | |
| 3624 | |
| 3625 display_state (); | |
| 3626 | |
| 3627 std::cerr << "P: " << pattern << std::endl; | |
| 3628 std::cerr << "T: " << text << std::endl; | |
| 3629 } | |
| 3630 | |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3631 DEFUN (__display_tokens__, args, nargout, |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3632 "-*- texinfo -*-\n\ |
|
8812
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8767
diff
changeset
|
3633 @deftypefn {Built-in Function} {} __display_tokens__ ()\n\ |
|
7722
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3634 Query or set the internal variable that determines whether Octave's\n\ |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3635 lexer displays tokens as they are read.\n\ |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3636 @end deftypefn") |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3637 { |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3638 return SET_INTERNAL_VARIABLE (display_tokens); |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3639 } |
|
c3bb0b7a4261
lex.l: allow tokens to be displayed when parsed
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3640 |
| 4910 | 3641 DEFUN (__token_count__, , , |
| 3642 "-*- texinfo -*-\n\ | |
|
8812
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8767
diff
changeset
|
3643 @deftypefn {Built-in Function} {} __token_count__ ()\n\ |
| 4910 | 3644 Number of language tokens processed since Octave startup.\n\ |
| 3645 @end deftypefn") | |
| 3646 { | |
| 3647 return octave_value (Vtoken_count); | |
| 3648 } | |
| 3649 | |
| 8535 | 3650 DEFUN (__lexer_debug_flag__, args, nargout, |
|
8812
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8767
diff
changeset
|
3651 "-*- texinfo -*-\n\ |
|
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8767
diff
changeset
|
3652 @deftypefn {Built-in Function} {@var{old_val} =} __lexer_debug_flag__ (@var{new_val}))\n\ |
|
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8767
diff
changeset
|
3653 Undocumented internal function.\n\ |
|
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8767
diff
changeset
|
3654 @end deftypefn") |
| 8535 | 3655 { |
| 3656 octave_value retval; | |
| 3657 | |
| 3658 retval = set_internal_variable (lexer_debug_flag, args, nargout, | |
| 3659 "__lexer_debug_flag__"); | |
| 3660 | |
| 3661 return retval; | |
| 3662 } | |
| 3663 | |
| 1994 | 3664 /* |
| 3665 ;;; Local Variables: *** | |
| 3666 ;;; mode: C++ *** | |
| 3667 ;;; End: *** | |
| 3668 */ |