Mercurial > hg > octave-lyh
view libinterp/corefcn/__pchip_deriv__.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) 2002-2012 Kai Habel Copyright (C) 2008-2009 Jaroslav Hajek 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 "defun.h" #include "error.h" #include "gripes.h" #include "oct-obj.h" #include "utils.h" #include "f77-fcn.h" extern "C" { F77_RET_T F77_FUNC (dpchim, DPCHIM) (const octave_idx_type& n, const double *x, const double *f, double *d, const octave_idx_type &incfd, octave_idx_type *ierr); F77_RET_T F77_FUNC (pchim, PCHIM) (const octave_idx_type& n, const float *x, const float *f, float *d, const octave_idx_type& incfd, octave_idx_type *ierr); } // Wrapper for SLATEC/PCHIP function DPCHIM to calculate the derivates // for piecewise polynomials. DEFUN (__pchip_deriv__, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} __pchip_deriv__ (@var{x}, @var{y}, @var{dim})\n\ Undocumented internal function.\n\ @end deftypefn") { octave_value retval; const int nargin = args.length (); bool rows = (nargin == 3 && args (2).uint_value () == 2); if (nargin >= 2) { if (args(0).is_single_type () || args(1).is_single_type ()) { FloatColumnVector xvec (args(0).float_vector_value ()); FloatMatrix ymat (args(1).float_matrix_value ()); octave_idx_type nx = xvec.length (); if (nx < 2) { error ("__pchip_deriv__: X must be at least of length 2"); return retval; } octave_idx_type nyr = ymat.rows (); octave_idx_type nyc = ymat.columns (); if (nx != (rows ? nyc : nyr)) { error ("__pchip_deriv__: X and Y dimension mismatch"); return retval; } const float *yvec = ymat.data (); FloatMatrix dmat (nyr, nyc); float *dvec = dmat.fortran_vec (); octave_idx_type ierr; const octave_idx_type incfd = rows ? nyr : 1; const octave_idx_type inc = rows ? 1 : nyr; for (octave_idx_type i = (rows ? nyr : nyc); i > 0; i--) { F77_FUNC (pchim, PCHIM) (nx, xvec.data (), yvec, dvec, incfd, &ierr); yvec += inc; dvec += inc; if (ierr < 0) { error ("PCHIM: error: %i\n", ierr); return retval; } } retval = dmat; } else { ColumnVector xvec (args(0).vector_value ()); Matrix ymat (args(1).matrix_value ()); octave_idx_type nx = xvec.length (); if (nx < 2) { error ("__pchip_deriv__: X must be at least of length 2"); return retval; } octave_idx_type nyr = ymat.rows (); octave_idx_type nyc = ymat.columns (); if (nx != (rows ? nyc : nyr)) { error ("__pchip_deriv__: X and Y dimension mismatch"); return retval; } const double *yvec = ymat.data (); Matrix dmat (nyr, nyc); double *dvec = dmat.fortran_vec (); octave_idx_type ierr; const octave_idx_type incfd = rows ? nyr : 1; const octave_idx_type inc = rows ? 1 : nyr; for (octave_idx_type i = (rows ? nyr : nyc); i > 0; i--) { F77_FUNC (dpchim, DPCHIM) (nx, xvec.data (), yvec, dvec, incfd, &ierr); yvec += inc; dvec += inc; if (ierr < 0) { error ("DPCHIM: error: %i\n", ierr); return retval; } } retval = dmat; } } return retval; } /* ## No test needed for internal helper function. %!assert (1) */