Mercurial > hg > octave-lyh
view libinterp/corefcn/__dispatch__.cc @ 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 | 2fc554ffbc28 |
children |
line wrap: on
line source
/* Copyright (C) 2001-2012 John W. Eaton and Paul Kienzle 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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <list> #include <map> #include <string> #include "Cell.h" #include "oct-map.h" #include "defun.h" #include "ov.h" #include "ov-fcn.h" #include "ov-typeinfo.h" #include "pager.h" #include "parse.h" #include "symtab.h" #include "variables.h" DEFUN (__dispatch__, args, nargout, "Undocumented internal function") { octave_value retval; int nargin = args.length (); std::string f, r, t; if (nargin > 0 && nargin < 4) { if (nargin > 0) { f = args(0).string_value (); if (error_state) { error ("__dispatch__: first argument must be a function name"); return retval; } } if (nargin > 1) { r = args(1).string_value (); if (error_state) { error ("__dispatch__: second argument must be a function name"); return retval; } } if (nargin > 2) { t = args(2).string_value (); if (error_state) { error ("__dispatch__: third argument must be a type name"); return retval; } } if (nargin == 1) { if (nargout > 0) { symbol_table::fcn_info::dispatch_map_type dm = symbol_table::get_dispatch (f); size_t len = dm.size (); Cell type_field (len, 1); Cell name_field (len, 1); symbol_table::fcn_info::dispatch_map_type::const_iterator p = dm.begin (); for (size_t i = 0; i < len; i++) { type_field(i) = p->first; name_field(i) = p->second; p++; } octave_scalar_map m; m.assign ("type", type_field); m.assign ("name", name_field); retval = m; } else symbol_table::print_dispatch (octave_stdout, f); } else if (nargin == 2) { t = r; symbol_table::clear_dispatch (f, t); } else symbol_table::add_dispatch (f, t, r); } else print_usage (); return retval; } /* ## No test needed for internal helper function. %!assert (1) */