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