Mercurial > octave
view libinterp/corefcn/ls-oct-binary.cc @ 24540:46440078d73b
don't use singleton for octave_value_typeinfo
* ov-typeinfo.h, ov-typeinfo.cc (type_info): New class containing the
functionaity provided by the non-static functions in the
octave_value_typeinfo class. Define in octave namespace.
(octave_value_typeinfo): Now a namespace containing global functions
instead of a class containing all static functions. Provided for
backward compatibility, so all functions are tagged as deprecated.
* ops.h (INSTALL_UNOP_TI, INSTALL_NCUNOP_TI, INSTALL_BINOP_TI,
INSTALL_CATOP_TI, INSTALL_ASSIGNOP_TI, INSTALL_ASSIGNANYOP_TI,
INSTALL_ASSIGNCONV_TI, INSTALL_WIDENOP_TI): New macros.
(install_ops): Accept reference to type_info object as
an argument.
* mk-ops.sh: Generate function decls and calls that pass reference
to type_info object as an argument.
* op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc,
op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc,
op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc,
op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc,
op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc,
op-dm-template.cc, op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc,
op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc,
op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc,
op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc,
op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc,
op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-int.h, op-m-cm.cc,
op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc,
op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc,
op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc,
op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc,
op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc,
op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc,
op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc,
op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc,
op-ui8-ui8.cc): Use new _T1 macros. Update install_TYPE_ops function
for each type to accept reference to type_info object as argument.
* interpreter.h, interpreter.cc (interpreter::m_type_info):
New member variable.
(interpreter::get_type_info): New function.
(interpreter::interpreter): Initialize m_type_info before
m_symbol_table. Don't call install_types or install ops. That is now
handled by the in type_info constructor. Don't call m_cdef_manager.
That is now handled by the cdef_manager constructor.
* interpreter-private.h, interpreter-private.cc (__get_type_info__):
New function. Use where necessary to get reference to
interpreter::m_type_info object.
* ov-classdef.cc, ov-classdef.h (octave_classdef::octave_classdef):
Handle all initialization here.
(octave_classdef::initialize): Delete unused function.
* ov.h, ov.cc (install_types): Accept reference to type_info object as
argument. Pass on to individual register_type functions.
* ov-base.h, ov-base.cc (DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA): Update
to define additional register_type functions that accepts reference to
type_info object.
(install_base_type_conversions): Update to use new *_TI macros.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 05 Jan 2018 18:44:53 -0500 |
parents | 194eb4bd202b |
children | 6652d3823428 |
line wrap: on
line source
/* Copyright (C) 1996-2017 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 <https://www.gnu.org/licenses/>. */ #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <iostream> #include <string> #include "byte-swap.h" #include "data-conv.h" #include "file-ops.h" #include "glob-match.h" #include "lo-mappers.h" #include "mach-info.h" #include "oct-env.h" #include "oct-locbuf.h" #include "oct-time.h" #include "defun.h" #include "error.h" #include "errwarn.h" #include "interpreter-private.h" #include "load-save.h" #include "ls-oct-binary.h" #include "ls-utils.h" #include "ov-cell.h" #include "ov.h" #include "pager.h" #include "pt-exp.h" #include "sysdep.h" #include "utils.h" #include "variables.h" #include "version.h" // Extract one value (scalar, matrix, string, etc.) from stream IS and // place it in TC, returning the name of the variable. If the value // is tagged as global in the file, return TRUE in GLOBAL. If SWAP // is TRUE, swap bytes after reading. // // The data is expected to be in the following format: // // Header (one per file): // ===================== // // object type bytes // ------ ---- ----- // magic number string 10 // // float format integer 1 // // // Data (one set for each item): // ============================ // // object type bytes // ------ ---- ----- // name_length integer 4 // // name string name_length // // doc_length integer 4 // // doc string doc_length // // global flag integer 1 // // data type char 1 // // In general "data type" is 255, and in that case the next arguments // in the data set are // // object type bytes // ------ ---- ----- // type_length integer 4 // // type string type_length // // The string "type" is then used with octave::type_info::lookup_type // to create an octave_value of the correct type. The specific load/save // function is then called. // // For backward compatibility "data type" can also be a value between 1 // and 7, where this defines a hardcoded octave_value of the type // // data type octave_value // --------- ------------ // 1 scalar // 2 matrix // 3 complex scalar // 4 complex matrix // 5 string (old style storage) // 6 range // 7 string // // Except for "data type" equal 5 that requires special treatment, these // old style "data type" value also cause the specific load/save functions // to be called. FILENAME is used for error messages. std::string read_binary_data (std::istream& is, bool swap, octave::mach_info::float_format fmt, const std::string& filename, bool& global, octave_value& tc, std::string& doc) { std::string retval; unsigned char tmp = 0; int32_t name_len = 0; int32_t doc_len = 0; doc.clear (); // We expect to fail here, at the beginning of a record, so not // being able to read another name should not result in an error. is.read (reinterpret_cast<char *> (&name_len), 4); if (! is) return retval; if (swap) swap_bytes<4> (&name_len); { OCTAVE_LOCAL_BUFFER (char, name, name_len+1); name[name_len] = '\0'; if (! is.read (reinterpret_cast<char *> (name), name_len)) error ("load: trouble reading binary file '%s'", filename.c_str ()); retval = name; } is.read (reinterpret_cast<char *> (&doc_len), 4); if (! is) error ("load: trouble reading binary file '%s'", filename.c_str ()); if (swap) swap_bytes<4> (&doc_len); { OCTAVE_LOCAL_BUFFER (char, tdoc, doc_len+1); tdoc[doc_len] = '\0'; if (! is.read (reinterpret_cast<char *> (tdoc), doc_len)) error ("load: trouble reading binary file '%s'", filename.c_str ()); doc = tdoc; } if (! is.read (reinterpret_cast<char *> (&tmp), 1)) error ("load: trouble reading binary file '%s'", filename.c_str ()); global = (tmp ? 1 : 0); tmp = 0; if (! is.read (reinterpret_cast<char *> (&tmp), 1)) error ("load: trouble reading binary file '%s'", filename.c_str ()); octave::type_info& type_info = octave::__get_type_info__ ("read_binary_data"); // All cases except 255 kept for backwards compatibility switch (tmp) { case 1: tc = type_info.lookup_type ("scalar"); break; case 2: tc = type_info.lookup_type ("matrix"); break; case 3: tc = type_info.lookup_type ("complex scalar"); break; case 4: tc = type_info.lookup_type ("complex matrix"); break; case 5: { // FIXME: // This is cruft, since its for a save type that is old. // Maybe this is taking backward compatibility too far! int32_t len; if (! is.read (reinterpret_cast<char *> (&len), 4)) error ("load: trouble reading binary file '%s'", filename.c_str ()); if (swap) swap_bytes<4> (&len); OCTAVE_LOCAL_BUFFER (char, s, len+1); if (! is.read (reinterpret_cast<char *> (s), len)) error ("load: trouble reading binary file '%s'", filename.c_str ()); s[len] = '\0'; tc = s; // Early return, since don't want rest of this function return retval; } break; case 6: tc = type_info.lookup_type ("range"); break; case 7: tc = type_info.lookup_type ("string"); break; case 255: { // Read the saved variable type int32_t len; if (! is.read (reinterpret_cast<char *> (&len), 4)) error ("load: trouble reading binary file '%s'", filename.c_str ()); if (swap) swap_bytes<4> (&len); OCTAVE_LOCAL_BUFFER (char, s, len+1); if (! is.read (s, len)) error ("load: trouble reading binary file '%s'", filename.c_str ()); s[len] = '\0'; std::string typ = s; tc = type_info.lookup_type (typ); } break; default: error ("load: trouble reading binary file '%s'", filename.c_str ()); break; } if (! tc.load_binary (is, swap, fmt)) error ("load: trouble reading binary file '%s'", filename.c_str ()); return retval; } // Save the data from TC along with the corresponding NAME, help // string DOC, and global flag MARK_AS_GLOBAL on stream OS in the // binary format described above for read_binary_data. bool save_binary_data (std::ostream& os, const octave_value& tc, const std::string& name, const std::string& doc, bool mark_global, bool save_as_floats) { int32_t name_len = name.length (); os.write (reinterpret_cast<char *> (&name_len), 4); os << name; int32_t doc_len = doc.length (); os.write (reinterpret_cast<char *> (&doc_len), 4); os << doc; unsigned char tmp; tmp = mark_global; os.write (reinterpret_cast<char *> (&tmp), 1); // 255 flags the new binary format tmp = 255; os.write (reinterpret_cast<char *> (&tmp), 1); // Write the string corresponding to the octave_value type std::string typ = tc.type_name (); int32_t len = typ.length (); os.write (reinterpret_cast<char *> (&len), 4); const char *btmp = typ.data (); os.write (btmp, len); // The octave_value of tc is const. Make a copy... octave_value val = tc; // Call specific save function bool success = val.save_binary (os, save_as_floats); return (os && success); }