Mercurial > hg > octave-lyh
view src/procstream.h @ 13241:2a8dcb5b3a00
improve default indexing for objects
* ov-class.cc (octave_class::is_class_method): Also return true for
anonymous functions executing in the context of a class method or
constructor.
* ov-class.h (octave_class:do_multi_index_op): New function.
* ov-fcn.h (octave_function::is_private_function_of_class): Now const.
(octave_function::is_anonymous_function_of_class): New virtual function.
* ov-usr-fcn.h (octave_function::anonymous_function): New data member.
(octave_user_function::mark_as_anonymous_function): New function.
(octave_user_function::is_anonymous_function): New function.
(octave_user_function::is_anonymous_function_of_class): New function.
* ov-usr-fcn.cc (octave_user_function::octave_user_function):
Initialize anonymous_function data member.
(octave_user_function::profiler_name): Distinguish between inline and
anonymous functions.
(octave_user_function::do_multi_index_op): Use is_anonymous_function
instead of checking whether cmd_list is marked as an anonymous
function body.
* pt-fcn-handle.cc (tree_anon_fcn_handle::rvalue1): If parent function
is a class method or constructor, stash the dispatch type in the new
function. Mark the new function as anonymous, not inline.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 28 Sep 2011 16:45:21 -0400 |
parents | 12df7854fa7c |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 1993-2011 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_procstream_h) #define octave_procstream_h 1 #include <iosfwd> #include <string> #include <sys/types.h> #include "oct-procbuf.h" class OCTINTERP_API procstreambase : virtual public std::ios { public: procstreambase (void) : pb () { pb_init (); } procstreambase (const std::string& name, int mode); procstreambase (const char *name, int mode); ~procstreambase (void) { close (); } void open (const std::string& name, int mode) { open (name.c_str (), mode); } void open (const char *name, int mode); int is_open (void) const { return pb.is_open (); } int close (void); pid_t pid (void) const { return pb.pid (); } int file_number (void) const { return pb.file_number (); } private: octave_procbuf pb; void pb_init (void) { init (&pb); } procstreambase (const procstreambase&); procstreambase& operator = (const procstreambase&); }; class OCTINTERP_API iprocstream : public std::istream, public procstreambase // iprocstream : public procstreambase, public std::istream { public: iprocstream (void) : std::istream (0), procstreambase () { } iprocstream (const std::string& name, int mode = std::ios::in) : std::istream (0), procstreambase (name, mode) { } iprocstream (const char *name, int mode = std::ios::in) : std::istream (0), procstreambase (name, mode) { } ~iprocstream (void) { } void open (const std::string& name, int mode = std::ios::in) { procstreambase::open (name, mode); } void open (const char *name, int mode = std::ios::in) { procstreambase::open (name, mode); } private: iprocstream (const iprocstream&); iprocstream& operator = (const iprocstream&); }; class OCTINTERP_API oprocstream : public std::ostream, public procstreambase // oprocstream : public procstreambase, public std::ostream { public: oprocstream (void) : std::ostream (0), procstreambase () { } oprocstream (const std::string& name, int mode = std::ios::out) : std::ostream (0), procstreambase(name, mode) { } oprocstream (const char *name, int mode = std::ios::out) : std::ostream (0), procstreambase(name, mode) { } ~oprocstream (void) { } void open (const std::string& name, int mode = std::ios::out) { procstreambase::open (name, mode); } void open (const char *name, int mode = std::ios::out) { procstreambase::open (name, mode); } private: oprocstream (const oprocstream&); oprocstream& operator = (const oprocstream&); }; class OCTINTERP_API procstream : public std::iostream, public procstreambase // procstream : public procstreambase, public std::iostream { public: procstream (void) : std::iostream (0), procstreambase () { } procstream (const std::string& name, int mode) : std::iostream (0), procstreambase (name, mode) { } procstream (const char *name, int mode) : std::iostream (0), procstreambase (name, mode) { } ~procstream (void) { } void open (const std::string& name, int mode) { procstreambase::open (name, mode); } void open (const char *name, int mode) { procstreambase::open (name, mode); } private: procstream (const procstream&); procstream& operator = (const procstream&); }; #endif