Mercurial > hg > octave-lyh
view 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 |
line wrap: on
line source
/* Copyright (C) 1993-2012 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_token_h) #define octave_token_h 1 #include <string> #include "symtab.h" class token { public: enum token_type { generic_token, string_token, double_token, ettype_token, sym_rec_token, scls_rec_token, meta_rec_token }; enum end_tok_type { simple_end, classdef_end, enumeration_end, events_end, for_end, function_end, if_end, methods_end, parfor_end, properties_end, switch_end, while_end, try_catch_end, unwind_protect_end }; token (int l = -1, int c = -1); token (const std::string& s, int l = -1, int c = -1); token (double d, const std::string& s = std::string (), int l = -1, int c = -1); token (end_tok_type t, int l = -1, int c = -1); token (symbol_table::symbol_record *s, int l = -1, int c = -1); token (symbol_table::symbol_record *cls, symbol_table::symbol_record *pkg, int l = -1, int c = -1); token (symbol_table::symbol_record *mth, symbol_table::symbol_record *cls, symbol_table::symbol_record *pkg, int l = -1, int c = -1); ~token (void); int line (void) { return line_num; } int column (void) { return column_num; } std::string text (void); double number (void); end_tok_type ettype (void); symbol_table::symbol_record *sym_rec (void); symbol_table::symbol_record *method_rec (void); symbol_table::symbol_record *class_rec (void); symbol_table::symbol_record *package_rec (void); symbol_table::symbol_record *meta_class_rec (void); symbol_table::symbol_record *meta_package_rec (void); std::string text_rep (void); private: // No copying! token (const token& tok); token& operator = (const token& tok); int line_num; int column_num; token_type type_tag; union { std::string *str; double num; end_tok_type et; symbol_table::symbol_record *sr; struct { symbol_table::symbol_record *mr; symbol_table::symbol_record *cr; symbol_table::symbol_record *pr; } sc; struct { symbol_table::symbol_record *cr; symbol_table::symbol_record *pr; } mc; }; std::string orig_text; }; #endif