Mercurial > hg > octave-lyh
view libinterp/corefcn/colloc.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) 1996-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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <string> #include "CollocWt.h" #include "lo-mappers.h" #include "defun.h" #include "error.h" #include "oct-obj.h" #include "utils.h" DEFUN (colloc, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {[@var{r}, @var{amat}, @var{bmat}, @var{q}] =} colloc (@var{n}, \"left\", \"right\")\n\ Compute derivative and integral weight matrices for orthogonal\n\ collocation using the subroutines given in J. Villadsen and\n\ M. L. Michelsen, @cite{Solution of Differential Equation Models by\n\ Polynomial Approximation}.\n\ @end deftypefn") { octave_value_list retval; int nargin = args.length (); if (nargin < 1 || nargin > 3) { print_usage (); return retval; } if (! args(0).is_scalar_type ()) { error ("colloc: N must be a scalar"); return retval; } double tmp = args(0).double_value (); if (error_state) return retval; if (xisnan (tmp)) { error ("colloc: N cannot be NaN"); return retval; } octave_idx_type ncol = NINTbig (tmp); if (ncol < 0) { error ("colloc: N must be positive"); return retval; } octave_idx_type ntot = ncol; octave_idx_type left = 0; octave_idx_type right = 0; for (int i = 1; i < nargin; i++) { if (args(i).is_defined ()) { if (! args(i).is_string ()) { error ("colloc: expecting string argument \"left\" or \"right\""); return retval; } std::string s = args(i).string_value (); if ((s.length () == 1 && (s[0] == 'R' || s[0] == 'r')) || s == "right") { right = 1; } else if ((s.length () == 1 && (s[0] == 'L' || s[0] == 'l')) || s == "left") { left = 1; } else { error ("colloc: unrecognized argument"); return retval; } } else { error ("colloc: unexpected empty argument"); return retval; } } ntot += left + right; if (ntot < 1) { error ("colloc: the total number of roots must be positive"); return retval; } CollocWt wts (ncol, left, right); ColumnVector r = wts.roots (); Matrix A = wts.first (); Matrix B = wts.second (); ColumnVector q = wts.quad_weights (); retval(3) = q; retval(2) = B; retval(1) = A; retval(0) = r; return retval; }