Mercurial > octave-nkf
view src/ov-re-diag.cc @ 15037:56b8eb7c9c04 classdef
improvements in parsing classdef
* liboctave/base-list.h (octave_base_list::octave_base_list (void),
octave_base_list::octave_base_list (const std::list<elt_type>&),
octave_base_list::operator = (const octave_base_list&),
octave_base_list::~octave_base_list (void)):
Now public.
* pt-classdef.h, pt-classdef.cc: New files.
* src/Makefile.am (PT_INCLUDES): Add pt-classdef.h to the list.
(PT_SRC): Add pt-classdef.cc to the list.
* pt-all.h: Include pt-classdef.h.
* ov.cc: Include ov-classdef.h.
* ov-classdef.cc: Include pt-classdef.h.
(cdef_class:make_meta_class): New method.
(F__meta_get_class__): Delete.
(F__superclass_reference__, F__meta_class_query__):
New functions.
* pt-id.h: Include oct-lvalue.h.
* pt-walk.h (tree_walker::visit_classdef (tree_classdef&),
tree_walker::visit_classdef_attribute (tree_classdef_attribute&),
tree_walker::visit_classdef_attribute_list (tree_classdef_attribute_list&),
tree_walker::visit_classdef_superclass (tree_classdef_superclass&),
tree_walker::visit_classdef_superclass_list (tree_classdef_superclass_list&),
tree_walker::visit_classdef_property (tree_classdef_property&),
tree_walker::visit_classdef_property_list (tree_classdef_property_list&),
tree_walker::visit_classdef_properties_block (tree_classdef_properties_block&),
tree_walker::visit_classdef_methods_list (tree_classdef_methods_list&),
tree_walker::visit_classdef_methods_block (tree_classdef_methods_block&),
tree_walker::visit_classdef_event (tree_classdef_event&),
tree_walker::visit_classdef_events_list (tree_classdef_events_list&),
tree_walker::visit_classdef_events_block (tree_classdef_events_block&),
tree_walker::visit_classdef_enum (tree_classdef_enum&),
tree_walker::visit_classdef_enum_list (tree_classdef_enum_list&),
tree_walker::visit_classdef_enum_block (tree_classdef_enum_block&),
tree_walker::visit_classdef_body (tree_classdef_body&)):
New virtual functions.
* token.h, token.cc (token::sc::mr, token::sc::cr, token::sc::pr,
token::mc::mr, token::mc::pr): Delete.
(token::sc::method_name, token::sc::package_name, token::sc::class_name,
token::mc::package_name, token::mc::class_name): New member variables.
(token::method_rec, token::class_rec, token::package_rec,
token::meta_class_rec, token::meta_package_rec): Delete.
(token::superclass_method_name, token::superclass_package_name,
token::superclass_class_name, token::meta_package_name,
token::meta_class_name): New methods.
(token::token (symbol_table::symbol_record*, int, int),
token::token (symbol_table::symbol_record*, symbol_table::symbol_record*, int, int),
token::token (symbol_table::symbol_record*, symbol_table::symbol_record*, symbol_table::symbol_record*, int, int)):
Delete.
(token::token (const std::string&, const std::string&, int, int),
token::token (const std::string&, const std::string&, const std::string&, int, int)):
New constructors.
(token::scls_rec_token, token::meta_rec_token): Delete enum values.
(token::scls_name_token, token::meta_rec_token): New enum values.
(token::~token): Delete sc and mc struct memebers.
* lex.ll, lex.h (lexical_feedback::parsing_classdef_get_method,
lexical_feedback::parsing_classdef_set_method)): New data members.
(lexical_feedback::lexical_feedback, lexical_feedback::init):
Initialize new data members.
(prep_lexer_for_classdef_file): New function.
(CLASSDEF_FILE_BEGIN): New exclusive start state.
(handle_superclass_identifier, handle_meta_identifier): Split
identifier here and create token with character strings.
(display_token): Handle CLASSDEF_FILE.
(display_state): Handle CLASSDEF_FILE_BEGIN.
* oct-parse.yy: Include ov-classdef.h and pt-funcall.h.
(classdef_object): New static variable.
(make_superclass_ref, make_meta_class_query, make_classdef,
make_classdef_properties_block, make_classdef_methods_block,
make_classdef_events_block, make_classdef_enum_block)): New functions.
(dummy_type): Delete unused nonterminal type.
(tok_type, tree_funcall_type, tree_function_def_type,
tree_classdef_type, tree_classdef_attribute_type,
tree_classdef_attribute_list_type, tree_classdef_superclass_type,
tree_classdef_superclass_list_type, tree_classdef_body_type,
tree_classdef_property_type, tree_classdef_property_list_type,
tree_classdef_properties_block_type, tree_classdef_methods_list_type,
tree_classdef_methods_block_type, tree_classdef_event_type,
tree_classdef_events_list_type, tree_classdef_events_block_type,
tree_classdef_enum_type, tree_classdef_enum_list_type,
tree_classdef_enum_block_type):
New types for nonterminals.
(CLASSDEF): Declare to have a tok_val token value.
(CLASSDEF_FILE): New token.
(classdef_end, properties_beg, methods_beg, events_beg, enum_beg,
classdef1): Delete nonterminals.
(property_list): Rename from properties_list.
(attr, class_event, class_enum, class_property, property_list,
properties_block, methods_list, methods_block, opt_attr_list,
attr_list, events_list, events_blcok, enum_list, enum_block,
class_body, classdef): Declare with specific types. Create parse tree
objects for these nonterminals.
(classdef_file): New nonterminal.
(parse_fcn_file): Handle classdef files. Don't treat classdef files
as scripts.
(command): Don't handle classdef here.
(input): Accept classdef_file here.
(fcn_name): If GET, set lexer_flags.parsing_classdef_get_method.
If SET, set lexer_flags.parsing_classdef_set_method.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 27 Jul 2012 17:10:25 -0400 |
parents | 72c96de7a403 |
children |
line wrap: on
line source
/* Copyright (C) 2008-2012 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 "byte-swap.h" #include "ov-re-diag.h" #include "ov-flt-re-diag.h" #include "ov-base-diag.cc" #include "ov-scalar.h" #include "ov-re-mat.h" #include "ls-utils.h" template class octave_base_diag<DiagMatrix, Matrix>; DEFINE_OCTAVE_ALLOCATOR (octave_diag_matrix); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_diag_matrix, "diagonal matrix", "double"); static octave_base_value * default_numeric_conversion_function (const octave_base_value& a) { CAST_CONV_ARG (const octave_diag_matrix&); return new octave_matrix (v.matrix_value ()); } octave_base_value::type_conv_info octave_diag_matrix::numeric_conversion_function (void) const { return octave_base_value::type_conv_info (default_numeric_conversion_function, octave_matrix::static_type_id ()); } static octave_base_value * default_numeric_demotion_function (const octave_base_value& a) { CAST_CONV_ARG (const octave_diag_matrix&); return new octave_float_diag_matrix (v.float_diag_matrix_value ()); } octave_base_value::type_conv_info octave_diag_matrix::numeric_demotion_function (void) const { return octave_base_value::type_conv_info (default_numeric_demotion_function, octave_float_diag_matrix::static_type_id ()); } octave_base_value * octave_diag_matrix::try_narrowing_conversion (void) { octave_base_value *retval = 0; if (matrix.nelem () == 1) retval = new octave_scalar (matrix (0, 0)); return retval; } octave_value octave_diag_matrix::do_index_op (const octave_value_list& idx, bool resize_ok) { octave_value retval; // This hack is to allow constructing permutation matrices using // eye(n)(p,:), eye(n)(:,q) && eye(n)(p,q) where p & q are permutation // vectors. if (! resize_ok && idx.length () == 2 && matrix.is_multiple_of_identity (1)) { idx_vector idx0 = idx(0).index_vector (); idx_vector idx1 = idx(1).index_vector (); if (! error_state) { bool left = idx0.is_permutation (matrix.rows ()); bool right = idx1.is_permutation (matrix.cols ()); if (left && right) { if (idx0.is_colon ()) left = false; if (idx1.is_colon ()) right = false; if (left && right) retval = PermMatrix (idx0, false) * PermMatrix (idx1, true); else if (left) retval = PermMatrix (idx0, false); else if (right) retval = PermMatrix (idx1, true); else { retval = this; this->count++; } } } } // if error_state is set, we've already griped. if (! error_state && retval.is_undefined ()) retval = octave_base_diag<DiagMatrix, Matrix>::do_index_op (idx, resize_ok); return retval; } DiagMatrix octave_diag_matrix::diag_matrix_value (bool) const { return matrix; } FloatDiagMatrix octave_diag_matrix::float_diag_matrix_value (bool) const { return FloatDiagMatrix (matrix); } ComplexDiagMatrix octave_diag_matrix::complex_diag_matrix_value (bool) const { return ComplexDiagMatrix (matrix); } FloatComplexDiagMatrix octave_diag_matrix::float_complex_diag_matrix_value (bool) const { return FloatComplexDiagMatrix (matrix); } octave_value octave_diag_matrix::map (unary_mapper_t umap) const { switch (umap) { case umap_abs: return matrix.abs (); case umap_real: case umap_conj: return matrix; case umap_imag: return DiagMatrix (matrix.rows (), matrix.cols (), 0.0); case umap_sqrt: { ComplexColumnVector tmp = matrix.diag ().map<Complex> (rc_sqrt); ComplexDiagMatrix retval (tmp); retval.resize (matrix.rows (), matrix.columns ()); return retval; } default: return to_dense ().map (umap); } } bool octave_diag_matrix::save_binary (std::ostream& os, bool& save_as_floats) { int32_t r = matrix.rows (), c = matrix.cols (); os.write (reinterpret_cast<char *> (&r), 4); os.write (reinterpret_cast<char *> (&c), 4); Matrix m = Matrix (matrix.diag ()); save_type st = LS_DOUBLE; if (save_as_floats) { if (m.too_large_for_float ()) { warning ("save: some values too large to save as floats --"); warning ("save: saving as doubles instead"); } else st = LS_FLOAT; } else if (matrix.length () > 8192) // FIXME -- make this configurable. { double max_val, min_val; if (m.all_integers (max_val, min_val)) st = get_save_type (max_val, min_val); } const double *mtmp = m.data (); write_doubles (os, mtmp, st, m.numel ()); return true; } bool octave_diag_matrix::load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt) { int32_t r, c; char tmp; if (! (is.read (reinterpret_cast<char *> (&r), 4) && is.read (reinterpret_cast<char *> (&c), 4) && is.read (reinterpret_cast<char *> (&tmp), 1))) return false; if (swap) { swap_bytes<4> (&r); swap_bytes<4> (&c); } DiagMatrix m (r, c); double *re = m.fortran_vec (); octave_idx_type len = m.length (); read_doubles (is, re, static_cast<save_type> (tmp), len, swap, fmt); if (error_state || ! is) return false; matrix = m; return true; } bool octave_diag_matrix::chk_valid_scalar (const octave_value& val, double& x) const { bool retval = val.is_real_scalar (); if (retval) x = val.double_value (); return retval; }