Mercurial > hg > octave-lyh
view libinterp/corefcn/load-save.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) 1994-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/>. */ #if !defined (octave_load_save_h) #define octave_load_save_h 1 #include <iosfwd> #include <string> #include "mach-info.h" #include "symtab.h" class octave_value; // FIXME: maybe MAT5 and MAT7 should be options to MAT_BINARY. // Similarly, save_as_floats may be an option for LS_BINARY, LS_HDF5 etc. enum load_save_format_type { LS_ASCII, LS_BINARY, LS_MAT_ASCII, LS_MAT_BINARY, LS_MAT5_BINARY, LS_MAT7_BINARY, #ifdef HAVE_HDF5 LS_HDF5, #endif /* HAVE_HDF5 */ LS_UNKNOWN }; enum load_save_format_options { // LS_MAT_ASCII options (not exclusive) LS_MAT_ASCII_LONG = 1, LS_MAT_ASCII_TABS = 2, // LS_MAT_BINARY options LS_MAT_BINARY_V5 = 1, LS_MAT_BINARY_V7, // zero means no option. LS_NO_OPTION = 0 }; class load_save_format { public: load_save_format (load_save_format_type t, load_save_format_options o = LS_NO_OPTION) : type (t), opts (o) { } operator int (void) const { return type; } int type, opts; }; extern void dump_octave_core (void); extern int read_binary_file_header (std::istream& is, bool& swap, oct_mach_info::float_format& flt_fmt, bool quiet = false); extern octave_value do_load (std::istream& stream, const std::string& orig_fname, load_save_format format, oct_mach_info::float_format flt_fmt, bool list_only, bool swap, bool verbose, const string_vector& argv, int argv_idx, int argc, int nargout); extern OCTINTERP_API bool is_octave_data_file (const std::string& file); extern void do_save (std::ostream& os, const symbol_table::symbol_record& sr, load_save_format fmt, bool save_as_floats); extern void write_header (std::ostream& os, load_save_format format); #endif