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