Mercurial > hg > octave-lyh
annotate libinterp/parse-tree/token.h @ 16253:a89cf57ba3a5
partial cleanup of continuation handling in lexer
* lex.h, lex.ll (octave_lexer::handle_continuation): New function.
(octave_lexer::finish_comment): Move to octave_lexer::finish_comment.
Don't return token. New argument, looking_at_continuation. If not
handling continuation, unput newline character.
(^{S}*{CCHAR}\{{S}*{NL}): Call yyless before finishing comment.
(^{S}*{CCHAR}\{{S}*{NL}, <BLOCK_COMMENT_START>^{S}*{CCHAR}\{{S}*{NL},
<LINE_COMMENT_START>{ANY_INCLUDING_NL},
<LINE_COMMENT_START>{S}*{CCHAR}.*{NL}): Don't return token.
(<LINE_COMMENT_START>{S}*{CCHAR}.*{NL}): Don't give COMMAND_START
start state special treatment.
({CONT}{S}*{NL}|{CONT}{S}*{COMMENT}):
Call octave_lexer::handle_continuation.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 09 Mar 2013 21:44:14 -0500 |
| parents | ec9c6222ef5a |
| children | 0259254a3ccc 12bf6a3f8c45 |
| rev | line source |
|---|---|
| 142 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
13249
diff
changeset
|
3 Copyright (C) 1993-2012 John W. Eaton |
| 142 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 142 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 142 | 20 |
| 21 */ | |
| 22 | |
| 383 | 23 #if !defined (octave_token_h) |
| 24 #define octave_token_h 1 | |
| 142 | 25 |
| 1755 | 26 #include <string> |
| 27 | |
|
16134
ec9c6222ef5a
move static parser helper functions to octave_parser class
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
28 #include "symtab.h" |
|
ec9c6222ef5a
move static parser helper functions to octave_parser class
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
29 |
| 453 | 30 class |
| 31 token | |
| 142 | 32 { |
| 33 public: | |
| 3548 | 34 |
| 142 | 35 enum token_type |
| 36 { | |
| 37 generic_token, | |
| 38 string_token, | |
| 39 double_token, | |
| 40 ettype_token, | |
| 9476 | 41 sym_rec_token, |
| 42 scls_rec_token, | |
| 43 meta_rec_token | |
| 142 | 44 }; |
| 45 | |
| 46 enum end_tok_type | |
| 47 { | |
| 48 simple_end, | |
| 9476 | 49 classdef_end, |
|
13249
7861a5fd3479
accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents:
13245
diff
changeset
|
50 enumeration_end, |
| 9476 | 51 events_end, |
| 142 | 52 for_end, |
| 53 function_end, | |
| 54 if_end, | |
| 9476 | 55 methods_end, |
|
13245
027a2186cd90
parfor keyword and infrastructure, but handle parfor as normal for loop for now
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
56 parfor_end, |
| 9476 | 57 properties_end, |
| 2764 | 58 switch_end, |
| 142 | 59 while_end, |
| 1489 | 60 try_catch_end, |
| 3548 | 61 unwind_protect_end |
| 142 | 62 }; |
| 63 | |
| 64 token (int l = -1, int c = -1); | |
| 3523 | 65 token (const std::string& s, int l = -1, int c = -1); |
| 3552 | 66 token (double d, const std::string& s = std::string (), |
| 10313 | 67 int l = -1, int c = -1); |
| 142 | 68 token (end_tok_type t, int l = -1, int c = -1); |
| 7336 | 69 token (symbol_table::symbol_record *s, int l = -1, int c = -1); |
| 9476 | 70 token (symbol_table::symbol_record *cls, |
| 71 symbol_table::symbol_record *pkg, int l = -1, int c = -1); | |
| 72 token (symbol_table::symbol_record *mth, | |
| 73 symbol_table::symbol_record *cls, | |
| 74 symbol_table::symbol_record *pkg, int l = -1, int c = -1); | |
| 142 | 75 |
| 1755 | 76 ~token (void); |
| 142 | 77 |
| 1755 | 78 int line (void) { return line_num; } |
| 79 int column (void) { return column_num; } | |
| 142 | 80 |
| 3523 | 81 std::string text (void); |
| 142 | 82 double number (void); |
| 83 end_tok_type ettype (void); | |
| 7336 | 84 symbol_table::symbol_record *sym_rec (void); |
| 142 | 85 |
| 9476 | 86 symbol_table::symbol_record *method_rec (void); |
| 87 symbol_table::symbol_record *class_rec (void); | |
| 88 symbol_table::symbol_record *package_rec (void); | |
| 89 | |
| 90 symbol_table::symbol_record *meta_class_rec (void); | |
| 91 symbol_table::symbol_record *meta_package_rec (void); | |
| 92 | |
| 3523 | 93 std::string text_rep (void); |
| 581 | 94 |
| 142 | 95 private: |
| 3552 | 96 |
| 97 // No copying! | |
| 98 | |
| 1288 | 99 token (const token& tok); |
| 3552 | 100 |
| 1288 | 101 token& operator = (const token& tok); |
| 102 | |
| 142 | 103 int line_num; |
| 104 int column_num; | |
| 105 token_type type_tag; | |
| 106 union | |
| 107 { | |
| 3523 | 108 std::string *str; |
| 142 | 109 double num; |
| 110 end_tok_type et; | |
| 7336 | 111 symbol_table::symbol_record *sr; |
| 9476 | 112 struct |
| 113 { | |
| 114 symbol_table::symbol_record *mr; | |
| 115 symbol_table::symbol_record *cr; | |
| 116 symbol_table::symbol_record *pr; | |
| 117 } sc; | |
| 118 struct | |
| 119 { | |
| 120 symbol_table::symbol_record *cr; | |
| 121 symbol_table::symbol_record *pr; | |
| 122 } mc; | |
| 142 | 123 }; |
| 3523 | 124 std::string orig_text; |
| 142 | 125 }; |
| 126 | |
| 127 #endif |