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