Mercurial > hg > octave-lyh
view libinterp/corefcn/oct-obj.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 | 68fc671a9339 |
children |
line wrap: on
line source
/* Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "error.h" #include "oct-obj.h" #include "Cell.h" // We are likely to have a lot of octave_value_list objects to allocate, // so make the grow_size large. DEFINE_OCTAVE_ALLOCATOR2(octave_value_list, 1024); octave_value_list::octave_value_list (const std::list<octave_value_list>& lst) { octave_idx_type n = 0, nel = 0; // Determine number. for (std::list<octave_value_list>::const_iterator p = lst.begin (); p != lst.end (); p++) { n++; nel += p->length (); } // Optimize single-element case if (n == 1) data = lst.front ().data; else if (nel > 0) { data.resize (dim_vector (1, nel)); octave_idx_type k = 0; for (std::list<octave_value_list>::const_iterator p = lst.begin (); p != lst.end (); p++) { data.assign (idx_vector (k, k + p->length ()), p->data); k += p->length (); } assert (k == nel); } } octave_value_list& octave_value_list::prepend (const octave_value& val) { octave_idx_type n = length (); resize (n + 1); while (n > 0) { elem (n) = elem (n - 1); n--; } elem (0) = val; return *this; } octave_value_list& octave_value_list::append (const octave_value& val) { octave_idx_type n = length (); resize (n + 1); elem (n) = val; return *this; } octave_value_list& octave_value_list::append (const octave_value_list& lst) { octave_idx_type len = length (); octave_idx_type lst_len = lst.length (); resize (len + lst_len); for (octave_idx_type i = 0; i < lst_len; i++) elem (len + i) = lst (i); return *this; } octave_value_list& octave_value_list::reverse (void) { octave_idx_type n = length (); for (octave_idx_type i = 0; i < n / 2; i++) { octave_value tmp = elem (i); elem (i) = elem (n - i - 1); elem (n - i - 1) = tmp; } return *this; } octave_value_list octave_value_list::splice (octave_idx_type offset, octave_idx_type rep_length, const octave_value_list& lst) const { octave_value_list retval; octave_idx_type len = length (); if (offset < 0 || offset >= len) { if (! (rep_length == 0 && offset == len)) { error ("octave_value_list::splice: invalid OFFSET"); return retval; } } if (rep_length < 0 || rep_length + offset > len) { error ("octave_value_list::splice: invalid LENGTH"); return retval; } octave_idx_type lst_len = lst.length (); octave_idx_type new_len = len - rep_length + lst_len; retval.resize (new_len); octave_idx_type k = 0; for (octave_idx_type i = 0; i < offset; i++) retval(k++) = elem (i); for (octave_idx_type i = 0; i < lst_len; i++) retval(k++) = lst (i); for (octave_idx_type i = offset + rep_length; i < len; i++) retval(k++) = elem (i); return retval; } bool octave_value_list::all_strings_p (void) const { octave_idx_type n = length (); for (octave_idx_type i = 0; i < n; i++) if (! elem(i).is_string ()) return false; return true; } bool octave_value_list::all_scalars (void) const { octave_idx_type n = length (); for (octave_idx_type i = 0; i < n; i++) { dim_vector dv = elem(i).dims (); if (! dv.all_ones ()) return false; } return true; } bool octave_value_list::any_cell (void) const { octave_idx_type n = length (); for (octave_idx_type i = 0; i < n; i++) if (elem (i).is_cell ()) return true; return false; } bool octave_value_list::has_magic_colon (void) const { octave_idx_type n = length (); for (octave_idx_type i = 0; i < n; i++) if (elem(i).is_magic_colon ()) return true; return false; } string_vector octave_value_list::make_argv (const std::string& fcn_name) const { string_vector argv; if (all_strings_p ()) { octave_idx_type len = length (); octave_idx_type total_nr = 0; for (octave_idx_type i = 0; i < len; i++) { // An empty std::string ("") has zero columns and zero rows (a // change that was made for Matlab contemptibility. octave_idx_type n = elem(i).rows (); total_nr += n ? n : 1; } octave_idx_type k = 0; if (! fcn_name.empty ()) { argv.resize (total_nr+1); argv[0] = fcn_name; k = 1; } else argv.resize (total_nr); for (octave_idx_type i = 0; i < len; i++) { octave_idx_type nr = elem(i).rows (); if (nr < 2) argv[k++] = elem(i).string_value (); else { string_vector tmp = elem(i).all_strings (); for (octave_idx_type j = 0; j < nr; j++) argv[k++] = tmp[j]; } } } else error ("%s: expecting all arguments to be strings", fcn_name.c_str ()); return argv; } void octave_value_list::make_storable_values (void) { octave_idx_type len = length (); const Array<octave_value>& cdata = data; for (octave_idx_type i = 0; i < len; i++) { // This is optimized so that we don't force a copy unless necessary. octave_value tmp = cdata(i).storable_value (); if (! tmp.is_copy_of (cdata (i))) data(i) = tmp; } }