Mercurial > octave
changeset 32889:d312676c51c8 stable
move doc_string methods from cdef_class to cdef_meta_object
* cdef-object.h (cdef_meta_object_rep::m_doc_string,
cdef_meta_object_rep::doc_string): Move data member and functions here
from cdef_class_rep.
(cdef_meta_object::doc_string): Move functions here from cdef_class.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 31 Jan 2024 22:55:35 -0500 |
| parents | 2da9214df7a4 |
| children | 258444f64447 |
| files | libinterp/octave-value/cdef-class.h libinterp/octave-value/cdef-object.h |
| diffstat | 2 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave-value/cdef-class.h Wed Jan 31 00:21:31 2024 -0500 +++ b/libinterp/octave-value/cdef-class.h Wed Jan 31 22:55:35 2024 -0500 @@ -161,10 +161,6 @@ bool is_meta_class () const { return m_meta; } - void doc_string (const std::string& txt) { m_doc_string = txt; } - - std::string doc_string () const { return m_doc_string; } - void file_name (const std::string& nm) { m_file_name = nm; } std::string file_name () const { return m_file_name; } @@ -194,8 +190,6 @@ std::string m_directory; - std::string m_doc_string; - std::string m_file_name; // The methods defined by this class. @@ -405,10 +399,6 @@ bool is_meta_class () const { return get_rep ()->is_meta_class (); } - void doc_string (const std::string& txt) { get_rep ()->doc_string (txt); } - - std::string doc_string () const { return get_rep ()->doc_string (); } - void file_name (const std::string& nm) { get_rep ()->file_name (nm); } std::string file_name () const { return get_rep ()->file_name (); }
--- a/libinterp/octave-value/cdef-object.h Wed Jan 31 00:21:31 2024 -0500 +++ b/libinterp/octave-value/cdef-object.h Wed Jan 31 22:55:35 2024 -0500 @@ -635,6 +635,10 @@ virtual bool is_package () const { return false; } + void doc_string (const std::string& txt) { m_doc_string = txt; } + + std::string doc_string () const { return m_doc_string; } + virtual octave_value_list meta_subsref (const std::string& /* type */, const std::list<octave_value_list>& /* idx */, @@ -652,6 +656,8 @@ protected: + std::string m_doc_string; + // Restricted copying! cdef_meta_object_rep (const cdef_meta_object_rep& obj) : handle_cdef_object (obj) @@ -685,6 +691,10 @@ bool is_package () const { return get_rep ()->is_package (); } + void doc_string (const std::string& txt) { get_rep ()->doc_string (txt); } + + std::string doc_string () const { return get_rep ()->doc_string (); } + octave_value_list meta_subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout)