Mercurial > hg > octave-lyh
view libinterp/corefcn/comment-list.h @ 17335:fe6518a1d87c
Move TeX symbol decoding into the lexer (bug #39831).
* libinterp/Makefile.am (BUILT_SOURCES): Add corefcn/oct-tex-symbols.cc.
(BUILT_DISTFILES): Add corefcn/oct-tex-lexer.ll and
corefcn/oct-tex-symbols.cc.
(EXTRA_DIST): Add corefcn/oct-tex-lexer.in.ll and
corefcn/oct-tex-symbols.in.
(ULT_DIST_SRC): Filter out corefcn/oct-tex-lexer.ll from DIST_SRC and
add corefcn/oct-tex-lexer.in.ll instead.
(CLEAN_FILES): Add corefcn/oct-tex-parser.output.
* libinterp/corefcn/modules.mk (corefcn/oct-tex-lexer.ll,
corefcn/oct-tex-symbols.cc): New rules to build the TeX lexer.
(corefcn/txt-eng.cc): Add dependency on corefcn/oct-tex-symbols.cc.
* libinterp/corefcn/oct-tex-lexer.in.ll: Renamed from oct-tex.lexer.ll.
Remove COMMAND state. Remove ID regex. Replace rules for symbols with
tag @SYMBOL_RULES@.
* libinterp/corefcn/oct-tex-parser.yy (ID, CMD, identifier): Remove
tokens.
(SYM, sym): New token and value.
(symbol_element): Build from SYM.
* libinterp/corefcn/oct-tex-symbols.in: New file with supported TeX
symbols and corresponding codes (unicode and MS symbols).
* libinterp/corefcn/txt-eng.h (class text_element_symbol): Make it
inherit from text_element.
(text_element_symbol::code): Removed member.
(text_element_symbol::symbol): New member.
(text_element_symbol::text_element_symbol): Adapt constructor.
(text_element_symbol::get_symbol): New method.
(text_element_symbol::get_symbol_code): Make const.
* libinterp/corefcn/txt-eng.cc (symbol_names, symbol_codes): Remove
static variables, now auto-generated from oct-tex-symbols.in.
(oct-tex-symbols.cc): New include.
(text_element_symbol::get_symbol_code): Change implementation to simply
index into auto-generated symbol_codes array.
* libinterp/corefcn/txt-eng-ft.cc
(ft_render::visit(text_element_symbol)): Don't use
text_element_symbol::string_value(), use
text_element_symbol::get_symbol() instead.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Sat, 24 Aug 2013 14:27:09 -0400 |
parents | 68fc671a9339 |
children |
line wrap: on
line source
/* Copyright (C) 2000-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_comment_list_h) #define octave_comment_list_h 1 #include <string> #include <base-list.h> extern std::string get_comment_text (void); extern char *get_comment_text_c_str (void); extern void save_comment_text (const std::string& text); class octave_comment_elt { public: enum comment_type { unknown, block, full_line, end_of_line, doc_string, copyright }; octave_comment_elt (const std::string& s = std::string (), comment_type t = unknown) : txt (s), typ (t) { } octave_comment_elt (const octave_comment_elt& oc) : txt (oc.txt), typ (oc.typ) { } octave_comment_elt& operator = (const octave_comment_elt& oc) { if (this != &oc) { txt = oc.txt; typ = oc.typ; } return *this; } std::string text (void) const { return txt; } comment_type type (void) const { return typ; } ~octave_comment_elt (void) { } private: // The text of the comment. std::string txt; // The type of comment. comment_type typ; }; class octave_comment_list : public octave_base_list<octave_comment_elt> { public: octave_comment_list (void) { } void append (const octave_comment_elt& elt) { octave_base_list<octave_comment_elt>::append (elt); } void append (const std::string& s, octave_comment_elt::comment_type t = octave_comment_elt::unknown) { append (octave_comment_elt (s, t)); } octave_comment_list *dup (void) const; }; class octave_comment_buffer { public: octave_comment_buffer (void) : comment_list (new octave_comment_list ()) { } ~octave_comment_buffer (void) { delete comment_list; } static bool instance_ok (void); static void append (const std::string& s, octave_comment_elt::comment_type t = octave_comment_elt::unknown); static octave_comment_list *get_comment (void); private: void do_append (const std::string& s, octave_comment_elt::comment_type t); octave_comment_list *do_get_comment (void); octave_comment_list *comment_list; static octave_comment_buffer *instance; static void cleanup_instance (void) { delete instance; instance = 0; } }; #endif