Mercurial > octave-nkf
view libinterp/octave-value/ov-float.h @ 18520:932aca9a7c57
Allow multi-level classdef package.
* lex.h (octave_base_lexer::fq_identifier_contains_keyword,
octave_base_lexer::handle_fq_identifier,
octave_base_lexer::enable_fq_identifier): New methods.
* lex.ll (octave_base_lexer::fq_identifier_contains_keyword,
octave_base_lexer::handle_fq_identifier,
octave_base_lexer::enable_fq_identifier): Likewise.
(FQ_IDENT_START, FQIDENT): New exclusive start condition and regex to
handle fully-qualified identifier.
(superclass reference rule, metaclass query rule): Use FQIDENT.
(octave_base_lexer::handle_superclass_identifier,
octave_base_lexer::handle_meta_identifier): Don't split package name.
* parse.h (octave_base_parser::make_superclass_ref,
octave_base_parser::make_meta_class_query): Remove package_nm argument.
* pt-classdef.h (tree_classdef_superclass::id,
tree_classdef_superclass::pkg): Removed members, replaced by cls_name.
(tree_classdef_superclass::~tree_classdef_superclass): Remove deletion
of removed members.
(tree_classdef_superclass::cls_name): New member.
(tree_classdef_superclass::tree_classdef_superclass): Initialize it.
(tree_classdef_superclass::ident, tree_classdef_superclass::package):
Removed methods.
(tree_classdef_superclass::class_name): New method.
* token.h (token::meta_name_token): Remove enum value.
(token(int, std::string, std::string, std::string, int, int)): Remove
constructor.
(token::superclass_package_name, token::meta_package_name,
token::meta_class_name): Remove methods.
(token::sc::package_nm, token::mc): Remove union members.
* token.cc
(token(int, std::string, std::string, std::string, int, int)): Remove
constructor.
(token::~token): Remove case of meta_name_token.
(token::superclass_package_name, token::meta_package_name,
token::meta_class_name): Remove methods.
* oct-parse.in.yy (FQ_IDENT): New terminal.
(superclass_identifier): Adapt to changes in class token and class
octave_base_parser.
(meta_identifier): Likewise.
(superclass_list): Add mid-rule to enable fully-qualified identifier.
(superclass): Use FQ_IDENT.
(octave_base_parser::make_superclass_ref,
octave_base_parser::make_meta_class_query): Remove package_nm argument.
* ov-classdef.cc (octave_classdef_superclass_ref::do_multi_index_op):
Adapt to removal of package_nm argument.
(F__meta_class_query__): Likewise.
(cdef_class::make_meta_class): Adapt to changes in class
tree_classdef_superclass.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Sat, 22 Feb 2014 19:56:17 -0500 |
parents | e473c4853afc |
children | 76478d2da117 |
line wrap: on
line source
/* Copyright (C) 1996-2013 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_ov_float_h) #define octave_ov_float_h 1 #include <cstdlib> #include <iosfwd> #include <string> #include "lo-ieee.h" #include "lo-mappers.h" #include "lo-utils.h" #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h" #include "gripes.h" #include "ov-base.h" #include "ov-re-mat.h" #include "ov-flt-re-mat.h" #include "ov-base-scalar.h" #include "ov-typeinfo.h" class octave_value_list; class tree_walker; // Real scalar values. class OCTINTERP_API octave_float_scalar : public octave_base_scalar<float> { public: octave_float_scalar (void) : octave_base_scalar<float> (0.0) { } octave_float_scalar (float d) : octave_base_scalar<float> (d) { } octave_float_scalar (const octave_float_scalar& s) : octave_base_scalar<float> (s) { } ~octave_float_scalar (void) { } octave_base_value *clone (void) const { return new octave_float_scalar (*this); } // We return an octave_matrix here instead of an octave_float_scalar so // that in expressions like A(2,2,2) = 2 (for A previously // undefined), A will be empty instead of a 1x1 object. octave_base_value *empty_clone (void) const { return new octave_float_matrix (); } octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); idx_vector index_vector (bool /* require_integers */ = false) const { return idx_vector (scalar); } octave_value any (int = 0) const { return (scalar != 0 && ! lo_ieee_isnan (scalar)); } builtin_type_t builtin_type (void) const { return btyp_float; } bool is_real_scalar (void) const { return true; } bool is_real_type (void) const { return true; } bool is_single_type (void) const { return true; } bool is_float_type (void) const { return true; } int8NDArray int8_array_value (void) const { return int8NDArray (dim_vector (1, 1), scalar); } int16NDArray int16_array_value (void) const { return int16NDArray (dim_vector (1, 1), scalar); } int32NDArray int32_array_value (void) const { return int32NDArray (dim_vector (1, 1), scalar); } int64NDArray int64_array_value (void) const { return int64NDArray (dim_vector (1, 1), scalar); } uint8NDArray uint8_array_value (void) const { return uint8NDArray (dim_vector (1, 1), scalar); } uint16NDArray uint16_array_value (void) const { return uint16NDArray (dim_vector (1, 1), scalar); } uint32NDArray uint32_array_value (void) const { return uint32NDArray (dim_vector (1, 1), scalar); } uint64NDArray uint64_array_value (void) const { return uint64NDArray (dim_vector (1, 1), scalar); } #define DEFINE_INT_SCALAR_VALUE(TYPE) \ octave_ ## TYPE \ TYPE ## _scalar_value (void) const \ { return octave_ ## TYPE (scalar); } DEFINE_INT_SCALAR_VALUE (int8) DEFINE_INT_SCALAR_VALUE (int16) DEFINE_INT_SCALAR_VALUE (int32) DEFINE_INT_SCALAR_VALUE (int64) DEFINE_INT_SCALAR_VALUE (uint8) DEFINE_INT_SCALAR_VALUE (uint16) DEFINE_INT_SCALAR_VALUE (uint32) DEFINE_INT_SCALAR_VALUE (uint64) #undef DEFINE_INT_SCALAR_VALUE double double_value (bool = false) const { return static_cast<double> (scalar); } float float_value (bool = false) const { return scalar; } double scalar_value (bool = false) const { return static_cast<double> (scalar); } float float_scalar_value (bool = false) const { return scalar; } Matrix matrix_value (bool = false) const { return Matrix (1, 1, scalar); } FloatMatrix float_matrix_value (bool = false) const { return FloatMatrix (1, 1, scalar); } NDArray array_value (bool = false) const { return NDArray (dim_vector (1, 1), scalar); } FloatNDArray float_array_value (bool = false) const { return FloatNDArray (dim_vector (1, 1), scalar); } SparseMatrix sparse_matrix_value (bool = false) const { return SparseMatrix (Matrix (1, 1, scalar)); } // FIXME Need SparseComplexMatrix (Matrix) constructor!!! SparseComplexMatrix sparse_complex_matrix_value (bool = false) const { return SparseComplexMatrix (sparse_matrix_value ()); } octave_value resize (const dim_vector& dv, bool fill = false) const; Complex complex_value (bool = false) const { return scalar; } FloatComplex float_complex_value (bool = false) const { return scalar; } ComplexMatrix complex_matrix_value (bool = false) const { return ComplexMatrix (1, 1, Complex (scalar)); } FloatComplexMatrix float_complex_matrix_value (bool = false) const { return FloatComplexMatrix (1, 1, FloatComplex (scalar)); } ComplexNDArray complex_array_value (bool = false) const { return ComplexNDArray (dim_vector (1, 1), Complex (scalar)); } FloatComplexNDArray float_complex_array_value (bool = false) const { return FloatComplexNDArray (dim_vector (1, 1), FloatComplex (scalar)); } charNDArray char_array_value (bool = false) const { charNDArray retval (dim_vector (1, 1)); retval(0) = static_cast<char> (scalar); return retval; } bool bool_value (bool warn = false) const { if (xisnan (scalar)) gripe_nan_to_logical_conversion (); else if (warn && scalar != 0 && scalar != 1) gripe_logical_conversion (); return scalar; } boolNDArray bool_array_value (bool warn = false) const { if (xisnan (scalar)) gripe_nan_to_logical_conversion (); else if (warn && scalar != 0 && scalar != 1) gripe_logical_conversion (); return boolNDArray (dim_vector (1, 1), scalar); } octave_value diag (octave_idx_type m, octave_idx_type n) const; octave_value convert_to_str_internal (bool pad, bool force, char type) const; void increment (void) { ++scalar; } void decrement (void) { --scalar; } bool save_ascii (std::ostream& os); bool load_ascii (std::istream& is); bool save_binary (std::ostream& os, bool& save_as_floats); bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt); #if defined (HAVE_HDF5) bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); bool load_hdf5 (hid_t loc_id, const char *name); #endif int write (octave_stream& os, int block_size, oct_data_conv::data_type output_type, int skip, oct_mach_info::float_format flt_fmt) const { return os.write (array_value (), block_size, output_type, skip, flt_fmt); } mxArray *as_mxArray (void) const; octave_value map (unary_mapper_t umap) const; bool fast_elem_insert_self (void *where, builtin_type_t btyp) const; private: DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif