Mercurial > octave-nkf
view src/ls-mat-ascii.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 | d174210ce1ec |
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 <cfloat> #include <cstring> #include <cctype> #include <fstream> #include <iomanip> #include <iostream> #include <sstream> #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-time.h" #include "quit.h" #include "str-vec.h" #include "Cell.h" #include "defun.h" #include "error.h" #include "gripes.h" #include "lex.h" #include "load-save.h" #include "ls-ascii-helper.h" #include "ls-mat-ascii.h" #include "oct-obj.h" #include "oct-map.h" #include "ov-cell.h" #include "pager.h" #include "pt-exp.h" #include "sysdep.h" #include "unwind-prot.h" #include "utils.h" #include "variables.h" #include "version.h" #include "dMatrix.h" static std::string get_mat_data_input_line (std::istream& is) { std::string retval; bool have_data = false; do { retval = ""; char c; while (is.get (c)) { if (c == '\n' || c == '\r') { is.putback (c); skip_preceeding_newline (is); break; } if (c == '%' || c == '#') { skip_until_newline (is, false); break; } if (! is.eof ()) { if (! have_data && c != ' ' && c != '\t') have_data = true; retval += c; } } } while (! (have_data || is.eof ())); return retval; } static void get_lines_and_columns (std::istream& is, const std::string& filename, octave_idx_type& nr, octave_idx_type& nc) { std::streampos pos = is.tellg (); int file_line_number = 0; nr = 0; nc = 0; while (is && ! error_state) { octave_quit (); std::string buf = get_mat_data_input_line (is); file_line_number++; size_t beg = buf.find_first_not_of (", \t"); // If we see a CR as the last character in the buffer, we had a // CRLF pair as the line separator. Any other CR in the text // will not be considered as whitespace. if (beg != std::string::npos && buf[beg] == '\r' && beg == buf.length () - 1) { // We had a blank line ending with a CRLF. Handle it the // same as an empty line. beg = std::string::npos; } octave_idx_type tmp_nc = 0; while (beg != std::string::npos) { tmp_nc++; size_t end = buf.find_first_of (", \t", beg); if (end != std::string::npos) { beg = buf.find_first_not_of (", \t", end); if (beg == std::string::npos || (buf[beg] == '\r' && beg == buf.length () - 1)) { // We had a line with trailing spaces and // ending with a CRLF, so this should look like EOL, // not a new colum. break; } } else break; } if (tmp_nc > 0) { if (nc == 0) { nc = tmp_nc; nr++; } else if (nc == tmp_nc) nr++; else error ("load: %s: inconsistent number of columns near line %d", filename.c_str (), file_line_number); } } if (nr == 0 || nc == 0) error ("load: file `%s' seems to be empty!", filename.c_str ()); is.clear (); is.seekg (pos); } // Extract a matrix from a file of numbers only. // // Comments are not allowed. The file should only have numeric values. // // Reads the file twice. Once to find the number of rows and columns, // and once to extract the matrix. // // FILENAME is used for error messages. // // This format provides no way to tag the data as global. std::string read_mat_ascii_data (std::istream& is, const std::string& filename, octave_value& tc) { std::string retval; std::string varname; size_t pos = filename.rfind ('/'); if (pos != std::string::npos) varname = filename.substr (pos+1); else varname = filename; pos = varname.rfind ('.'); if (pos != std::string::npos) varname = varname.substr (0, pos); size_t len = varname.length (); for (size_t i = 0; i < len; i++) { char c = varname[i]; if (! (isalnum (c) || c == '_')) varname[i] = '_'; } if (is_keyword (varname) || ! isalpha (varname[0])) varname.insert (0, "X"); if (valid_identifier (varname)) { octave_idx_type nr = 0; octave_idx_type nc = 0; int total_count = 0; get_lines_and_columns (is, filename, nr, nc); octave_quit (); if (! error_state && nr > 0 && nc > 0) { Matrix tmp (nr, nc); if (nr < 1 || nc < 1) is.clear (std::ios::badbit); else { double d; for (octave_idx_type i = 0; i < nr; i++) { std::string buf = get_mat_data_input_line (is); std::istringstream tmp_stream (buf); for (octave_idx_type j = 0; j < nc; j++) { octave_quit (); d = octave_read_value<double> (tmp_stream); if (tmp_stream || tmp_stream.eof ()) { tmp.elem (i, j) = d; total_count++; // Skip whitespace and commas. char c; while (1) { tmp_stream >> c; if (! tmp_stream) break; if (! (c == ' ' || c == '\t' || c == ',')) { tmp_stream.putback (c); break; } } if (tmp_stream.eof ()) break; } else { error ("load: failed to read matrix from file `%s'", filename.c_str ()); return retval; } } } } if (is || is.eof ()) { // FIXME -- not sure this is best, but it works. if (is.eof ()) is.clear (); octave_idx_type expected = nr * nc; if (expected == total_count) { tc = tmp; retval = varname; } else error ("load: expected %d elements, found %d", expected, total_count); } else error ("load: failed to read matrix from file `%s'", filename.c_str ()); } else error ("load: unable to extract matrix size from file `%s'", filename.c_str ()); } else error ("load: unable to convert filename `%s' to valid identifier", filename.c_str ()); return retval; } bool save_mat_ascii_data (std::ostream& os, const octave_value& val, int precision, bool tabs) { bool success = true; if (val.is_complex_type ()) warning ("save: omitting imaginary part for ASCII file"); Matrix m = val.matrix_value (true); if (error_state) { success = false; error_state = 0; } else { long old_precision = os.precision (); os.precision (precision); std::ios::fmtflags oflags = os.flags (static_cast<std::ios::fmtflags> (std::ios::scientific)); if (tabs) { for (octave_idx_type i = 0; i < m.rows (); i++) { for (octave_idx_type j = 0; j < m.cols (); j++) { // Omit leading tabs. if (j != 0) os << '\t'; octave_write_double (os, m (i, j)); } os << "\n"; } } else os << m; os.flags (oflags); os.precision (old_precision); } return (os && success); }