Mercurial > hg > octave-nkf
view libinterp/interp-core/comment-list.h @ 15351:a291f850743c
modernize mxArray class hierarchy
* mxarray.in.h: Move mxArray_base class definition here from mex.cc.
Don't derive mxArray_base from mxArray. Move all virtual tags from
mxArray functions to the corresponding mxArray_base functions.
(mxArray_base::as_mxArray): New virtual function.
(mxArray::dup): Attempt as_mxArray conversion first. If that
succeeds, set name of copy. Othewise, duplicate the rep object.
(struct xmxArray): Delete.
(mxArray_base::octave_value as_octave_value): Now public.
(mxArray_octave_value::octave_value as_octave_value): Now public.
(mxArray_number::octave_value as_octave_value): Now public.
(mxArray_sparse::octave_value as_octave_value): Now public.
(mxArray_struct::octave_value as_octave_value): Now public.
(mxArray_cell::octave_value as_octave_value): Now public.
(mxArray::mxArray (const xmxArray&)): Delete.
(mxArray::mxArray (mxArray_base*, const char*)): Arg is now
mxArray_base*, not mxArray*.
(mxArray::rep): Now mxArray_base*, not mxArray*.
* mex.cc (mxArray_octave_value::dup): Return mxArray_base*, not
mxArray*. Don't attempt conversion from octave_value to mxArray here.
(mxArray_octave_value::as_mxArray): New function.
(mxArray_number::dup): Return mxArray_base*, not mxArray_number*.
(mxArray_sparse::dup): Return mxArray_base*, not mxArray_sparse*.
(mxArray_struct::dup): Return mxArray_base*, not mxArray_struct*.
(mxArray_cell::dup): Return mxArray_base*, not mxArray_dup*.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 11 Sep 2012 13:38:44 -0400 |
parents | 2fc554ffbc28 |
children | e19b1632d7c1 |
line wrap: on
line source
/* Copyright (C) 2000-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_comment_list_h) #define octave_comment_list_h 1 #include <string> #include <base-list.h> extern std::string get_comment_text (void); extern char *get_comment_text_c_str (void); extern void save_comment_text (const std::string& text); class octave_comment_elt { public: enum comment_type { unknown, block, end_of_line, doc_string, copyright }; octave_comment_elt (const std::string& s = std::string (), comment_type t = unknown) : txt (s), typ (t) { } octave_comment_elt (const octave_comment_elt& oc) : txt (oc.txt), typ (oc.typ) { } octave_comment_elt& operator = (const octave_comment_elt& oc) { if (this != &oc) { txt = oc.txt; typ = oc.typ; } return *this; } std::string text (void) const { return txt; } comment_type type (void) const { return typ; } ~octave_comment_elt (void) { } private: // The text of the comment. std::string txt; // The type of comment. comment_type typ; }; class octave_comment_list : public octave_base_list<octave_comment_elt> { public: octave_comment_list (void) { } void append (const octave_comment_elt& elt) { octave_base_list<octave_comment_elt>::append (elt); } void append (const std::string& s, octave_comment_elt::comment_type t = octave_comment_elt::unknown) { append (octave_comment_elt (s, t)); } octave_comment_list *dup (void) const; }; class octave_comment_buffer { public: octave_comment_buffer (void) : comment_list (new octave_comment_list ()) { } ~octave_comment_buffer (void) { delete comment_list; } static bool instance_ok (void); static void append (const std::string& s, octave_comment_elt::comment_type t = octave_comment_elt::unknown); static octave_comment_list *get_comment (void); private: void do_append (const std::string& s, octave_comment_elt::comment_type t); octave_comment_list *do_get_comment (void); octave_comment_list *comment_list; static octave_comment_buffer *instance; static void cleanup_instance (void) { delete instance; instance = 0; } }; #endif