Mercurial > hg > octave-lyh
view libinterp/corefcn/Cell.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) 1999-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague 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 (Cell_h) #define Cell_h 1 #include <string> #include "Array.h" #include "oct-alloc.h" #include "str-vec.h" #include "ov.h" class octave_value_list; class OCTINTERP_API Cell : public Array<octave_value> { public: Cell (void) : Array<octave_value> (dim_vector (0, 0)) { } Cell (const octave_value& val) : Array<octave_value> (dim_vector (1, 1), val) { } Cell (const octave_value_list& ovl); Cell (octave_idx_type n, octave_idx_type m, const octave_value& val = Matrix ()) : Array<octave_value> (dim_vector (n, m), val) { } Cell (const dim_vector& dv, const octave_value& val = Matrix ()) : Array<octave_value> (dv, val) { } Cell (const Array<octave_value>& c) : Array<octave_value> (c) { } Cell (const Array<octave_value>& c, octave_idx_type nr, octave_idx_type nc) : Array<octave_value> (c, dim_vector (nr, nc)) { } Cell (const string_vector& sv, bool trim = false); Cell (const std::list<std::string>& lst); Cell (const Array<std::string>& sa); Cell (const dim_vector& dv, const string_vector& sv, bool trim = false); Cell (const Cell& c) : Array<octave_value> (c) { } bool is_cellstr (void) const; Array<std::string> cellstr_value (void) const; using Array<octave_value>::index; Cell index (const octave_value_list& idx, bool resize_ok = false) const; using Array<octave_value>::delete_elements; void delete_elements (const octave_value_list& idx); using Array<octave_value>::assign; void assign (const octave_value_list& idx, const Cell& rhs, const octave_value& fill_val = Matrix ()); Cell reshape (const dim_vector& new_dims) const { return Array<octave_value>::reshape (new_dims); } octave_idx_type nnz (void) const; Cell column (octave_idx_type i) const; // FIXME boolMatrix all (int /* dim */ = 0) const { return boolMatrix (); } // FIXME boolMatrix any (int /* dim */ = 0) const { return boolMatrix (); } Cell concat (const Cell& rb, const Array<octave_idx_type>& ra_idx); Cell& insert (const Cell& a, octave_idx_type r, octave_idx_type c); Cell& insert (const Cell& a, const Array<octave_idx_type>& ra_idx); // FIXME bool any_element_is_nan (void) const { return false; } bool is_true (void) const { return false; } octave_value resize_fill_value (void) const { static Matrix rfv; return rfv; } Cell diag (octave_idx_type k = 0) const; Cell diag (octave_idx_type m, octave_idx_type n) const; Cell xisalnum (void) const { return map (&octave_value::xisalnum); } Cell xisalpha (void) const { return map (&octave_value::xisalpha); } Cell xisascii (void) const { return map (&octave_value::xisascii); } Cell xiscntrl (void) const { return map (&octave_value::xiscntrl); } Cell xisdigit (void) const { return map (&octave_value::xisdigit); } Cell xisgraph (void) const { return map (&octave_value::xisgraph); } Cell xislower (void) const { return map (&octave_value::xislower); } Cell xisprint (void) const { return map (&octave_value::xisprint); } Cell xispunct (void) const { return map (&octave_value::xispunct); } Cell xisspace (void) const { return map (&octave_value::xisspace); } Cell xisupper (void) const { return map (&octave_value::xisupper); } Cell xisxdigit (void) const { return map (&octave_value::xisxdigit); } Cell xtoascii (void) const { return map (&octave_value::xtoascii); } Cell xtolower (void) const { return map (&octave_value::xtolower); } Cell xtoupper (void) const { return map (&octave_value::xtoupper); } private: typedef octave_value (octave_value::*ctype_mapper) (void) const; Cell map (ctype_mapper) const; }; template<> inline Cell octave_value_extract<Cell> (const octave_value& v) { return v.cell_value (); } #endif