octave: libinterp/octave-value/cdef-class.cc annotate

annotate libinterp/octave-value/cdef-class.cc @ 31605:e88a07dec498 stable

maint: Use macros to begin/end C++ namespaces. * oct-conf-post-public.in.h: Define two macros (OCTAVE_BEGIN_NAMESPACE, OCTAVE_END_NAMESPACE) that can be used to start/end a namespace. * mk-opts.pl, build-env.h, build-env.in.cc, __betainc__.cc, __contourc__.cc, __dsearchn__.cc, __eigs__.cc, __expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, auto-shlib.cc, auto-shlib.h, balance.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, data.h, debug.cc, defaults.cc, defaults.h, defun-int.h, defun.cc, det.cc, dirfns.cc, display.cc, display.h, dlmread.cc, dmperm.cc, dot.cc, dynamic-ld.cc, dynamic-ld.h, eig.cc, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gsvd.cc, gtk-manager.cc, gtk-manager.h, hash.cc, help.cc, help.h, hess.cc, hex2num.cc, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, kron.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-ascii-helper.cc, ls-ascii-helper.h, ls-oct-text.cc, ls-utils.cc, ls-utils.h, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex-private.h, mex.cc, mgorth.cc, nproc.cc, oct-fstrm.cc, oct-fstrm.h, oct-hdf5-types.cc, oct-hdf5-types.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, oct-tex-parser.yy, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-flt-fmt.cc, pr-output.cc, procstream.cc, procstream.h, psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xdiv.cc, sparse-xdiv.h, sparse-xpow.cc, sparse-xpow.h, sparse.cc, spparms.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symbfact.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, syscalls.cc, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, xdiv.h, xnorm.cc, xnorm.h, xpow.cc, xpow.h, __delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc, audioread.cc, convhulln.cc, fftw.cc, gzip.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-builtin.h, ov-cell.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-java.cc, ov-java.h, ov-mex-fcn.h, ov-null-mat.cc, ov-oncleanup.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, octave.cc, octave.h, mk-ops.sh, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc, op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-mi.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-vm-eval.cc, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h : Use new macros to begin/end C++ namespaces.

author	Rik <rik@octave.org>
date	Thu, 01 Dec 2022 14:23:45 -0800
parents	670a0d878af1
children	aac27ad79be6

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 30390 diff changeset	3 // Copyright (C) 2012-2022 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	25
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	26 #if defined (HAVE_CONFIG_H)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	27 # include "config.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	28 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	29
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	30 #include <algorithm>
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include <iomanip>
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	32
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	33 #include "cdef-class.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include "cdef-manager.h"
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	35 #include "cdef-method.h"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	36 #include "cdef-package.h"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	37 #include "cdef-property.h"
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include "cdef-utils.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include "errwarn.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	40 #include "interpreter-private.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include "interpreter.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include "load-path.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	43 #include "ov-builtin.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	44 #include "ov-classdef.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	45 #include "ov-fcn-handle.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	46 #include "ov-usr-fcn.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	47 #include "parse.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	48 #include "pt-assign.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	49 #include "pt-classdef.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	50 #include "pt-eval.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	51 #include "pt-idx.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	52 #include "pt-misc.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	53 #include "pt-stmt.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	54 #include "pt-walk.h"
27189 946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	55 #include "unwind-prot.h"
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	56
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	57 // Define to 1 to enable debugging statements.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	58 #define DEBUG_TRACE 0
27146 c776d553c19e * cdef-class.cc: Repair debug code. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26975 diff changeset	59 #if DEBUG_TRACE
c776d553c19e * cdef-class.cc: Repair debug code. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26975 diff changeset	60 # include <iostream>
c776d553c19e * cdef-class.cc: Repair debug code. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26975 diff changeset	61 #endif
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	62
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 31105 diff changeset	63 OCTAVE_BEGIN_NAMESPACE(octave)
e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 31105 diff changeset	64
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	65 static octave_value
28439 e760fef2829c refactor octave_fcn_handle class John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	66 make_fcn_handle (const octave_value& fcn, const std::string& meth_name,
e760fef2829c refactor octave_fcn_handle class John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	67 const std::string& class_name)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	68 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	69 octave_value retval;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	70
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	71 if (fcn.is_defined ())
26847 8bd9fd99c12a lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802) John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	72 {
28439 e760fef2829c refactor octave_fcn_handle class John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	73 // FCN_HANDLE: METHOD
e760fef2829c refactor octave_fcn_handle class John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	74 octave_fcn_handle *fh
e760fef2829c refactor octave_fcn_handle class John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	75 = new octave_fcn_handle (fcn, class_name, meth_name);
26847 8bd9fd99c12a lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802) John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	76
28439 e760fef2829c refactor octave_fcn_handle class John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	77 retval = octave_value (fh);
26847 8bd9fd99c12a lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802) John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	78 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	79
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	80 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	81 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	82
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	83 cdef_class::cdef_class_rep::cdef_class_rep (const std::list<cdef_class>& superclasses)
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	84 : cdef_meta_object_rep (), m_member_count (0), m_handle_class (false),
0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	85 m_meta (false)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	86 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	87 put ("SuperClasses", to_ov (superclasses));
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	88 m_implicit_ctor_list = superclasses;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	89 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	90
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	91 cdef_method
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	92 cdef_class::cdef_class_rep::find_method (const std::string& nm, bool local)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	93 {
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	94 auto it = m_method_map.find (nm);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	95
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	96 if (it == m_method_map.end ())
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	97 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	98 // FIXME: look into class directory
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	99 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	100 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	101 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	102 cdef_method& meth = it->second;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	103
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	104 // FIXME: check if method reload needed
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	105
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	106 if (meth.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	107 return meth;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	108 }
26773 a95887edd55e style fixes for classdef classes John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	109
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	110 if (! local)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	111 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	112 // Look into superclasses
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	113
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	114 Cell super_classes = get ("SuperClasses").cell_value ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	115
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	116 for (int i = 0; i < super_classes.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	117 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	118 cdef_class cls = lookup_class (super_classes(i));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	119
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	120 cdef_method meth = cls.find_method (nm);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	121
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	122 if (meth.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	123 return meth;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	124 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	125 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	126
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	127 return cdef_method ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	128 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	129
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	130 class ctor_analyzer : public tree_walker
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	131 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	132 public:
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	133
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	134 ctor_analyzer (void) = delete;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	135
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	136 ctor_analyzer (const std::string& ctor, const std::string& obj)
30141 58f043641a78 maint: use "m_" prefix for member variables in class ctor_analyzer. Rik <rik@octave.org> parents: 30075 diff changeset	137 : tree_walker (), m_who (ctor), m_obj_name (obj) { }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	138
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	139 ctor_analyzer (const ctor_analyzer&) = delete;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	140
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	141 ctor_analyzer& operator = (const ctor_analyzer&) = delete;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	142
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	143 ~ctor_analyzer (void) = default;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	144
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	145 void visit_statement (tree_statement& t)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	146 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	147 if (t.is_expression ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	148 t.expression ()->accept (*this);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	149 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	150
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	151 void visit_simple_assignment (tree_simple_assignment& t)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	152 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	153 t.right_hand_side ()->accept (*this);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	154 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	155
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	156 void visit_multi_assignment (tree_multi_assignment& t)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	157 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	158 t.right_hand_side ()->accept (*this);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	159 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	160
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	161 void visit_index_expression (tree_index_expression& t)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	162 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	163 t.expression ()->accept (*this);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	164 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	165
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	166 std::list<cdef_class> get_constructor_list (void) const
30141 58f043641a78 maint: use "m_" prefix for member variables in class ctor_analyzer. Rik <rik@octave.org> parents: 30075 diff changeset	167 { return m_ctor_list; }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	168
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	169 // NO-OP
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	170
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	171 void visit_anon_fcn_handle (tree_anon_fcn_handle&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	172 void visit_argument_list (tree_argument_list&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	173 void visit_binary_expression (tree_binary_expression&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	174 void visit_break_command (tree_break_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	175 void visit_colon_expression (tree_colon_expression&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	176 void visit_continue_command (tree_continue_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	177 void visit_decl_command (tree_decl_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	178 void visit_decl_init_list (tree_decl_init_list&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	179 void visit_decl_elt (tree_decl_elt&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	180 void visit_simple_for_command (tree_simple_for_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	181 void visit_complex_for_command (tree_complex_for_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	182 void visit_octave_user_script (octave_user_script&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	183 void visit_octave_user_function (octave_user_function&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	184 void visit_function_def (tree_function_def&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	185 void visit_identifier (tree_identifier&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	186 void visit_if_clause (tree_if_clause&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	187 void visit_if_command (tree_if_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	188 void visit_if_command_list (tree_if_command_list&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	189 void visit_switch_case (tree_switch_case&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	190 void visit_switch_case_list (tree_switch_case_list&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	191 void visit_switch_command (tree_switch_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	192 void visit_matrix (tree_matrix&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	193 void visit_cell (tree_cell&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	194 void visit_no_op_command (tree_no_op_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	195 void visit_constant (tree_constant&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	196 void visit_fcn_handle (tree_fcn_handle&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	197 void visit_parameter_list (tree_parameter_list&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	198 void visit_postfix_expression (tree_postfix_expression&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	199 void visit_prefix_expression (tree_prefix_expression&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	200 void visit_return_command (tree_return_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	201 void visit_try_catch_command (tree_try_catch_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	202 void visit_unwind_protect_command (tree_unwind_protect_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	203 void visit_while_command (tree_while_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	204 void visit_do_until_command (tree_do_until_command&) { }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	205
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	206 void visit_superclass_ref (tree_superclass_ref& t)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	207 {
30141 58f043641a78 maint: use "m_" prefix for member variables in class ctor_analyzer. Rik <rik@octave.org> parents: 30075 diff changeset	208 if (t.method_name () == m_obj_name)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	209 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	210 std::string class_name = t.class_name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	211
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	212 cdef_class cls = lookup_class (class_name, false);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	213
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	214 if (cls.ok ())
30141 58f043641a78 maint: use "m_" prefix for member variables in class ctor_analyzer. Rik <rik@octave.org> parents: 30075 diff changeset	215 m_ctor_list.push_back (cls);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	216 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	217 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	218
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	219 private:
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	220
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	221 // The name of the constructor being analyzed.
30141 58f043641a78 maint: use "m_" prefix for member variables in class ctor_analyzer. Rik <rik@octave.org> parents: 30075 diff changeset	222 std::string m_who;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	223
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	224 // The name of the first output argument of the constructor.
30141 58f043641a78 maint: use "m_" prefix for member variables in class ctor_analyzer. Rik <rik@octave.org> parents: 30075 diff changeset	225 std::string m_obj_name;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	226
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	227 // The list of superclass constructors that are explicitly called.
30141 58f043641a78 maint: use "m_" prefix for member variables in class ctor_analyzer. Rik <rik@octave.org> parents: 30075 diff changeset	228 std::list<cdef_class> m_ctor_list;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	229 };
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	230
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	231 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	232 cdef_class::cdef_class_rep::install_method (const cdef_method& meth)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	233 {
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	234 m_method_map[meth.get_name ()] = meth;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	235
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	236 m_member_count++;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	237
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	238 if (meth.is_constructor ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	239 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	240 // Analyze the constructor code to determine what superclass
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	241 // constructors are called explicitly.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	242
27505 c409d16b7190 eliminate some uses of bare pointers to octave_function objects John W. Eaton <jwe@octave.org> parents: 27445 diff changeset	243 octave_value ov_fcn = meth.get_function ();
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	244
27505 c409d16b7190 eliminate some uses of bare pointers to octave_function objects John W. Eaton <jwe@octave.org> parents: 27445 diff changeset	245 if (ov_fcn.is_defined ())
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	246 {
27505 c409d16b7190 eliminate some uses of bare pointers to octave_function objects John W. Eaton <jwe@octave.org> parents: 27445 diff changeset	247 octave_user_function *uf = ov_fcn.user_function_value (true);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	248
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	249 if (uf)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	250 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	251 tree_parameter_list *ret_list = uf->return_list ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	252 tree_statement_list *body = uf->body ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	253
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	254 if (! ret_list \|\| ret_list->size () != 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	255 error ("%s: invalid constructor output arguments",
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	256 meth.get_name ().c_str ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	257
30141 58f043641a78 maint: use "m_" prefix for member variables in class ctor_analyzer. Rik <rik@octave.org> parents: 30075 diff changeset	258 std::string m_obj_name = ret_list->front ()->name ();
58f043641a78 maint: use "m_" prefix for member variables in class ctor_analyzer. Rik <rik@octave.org> parents: 30075 diff changeset	259 ctor_analyzer a (meth.get_name (), m_obj_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	260
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	261 body->accept (a);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	262
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	263 std::list<cdef_class> explicit_ctor_list
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	264 = a.get_constructor_list ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	265
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	266 for (const auto& cdef_cls : explicit_ctor_list)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	267 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	268 #if DEBUG_TRACE
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	269 std::cerr << "explicit superclass constructor: "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	270 << cdef_cls.get_name () << std::endl;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	271 #endif
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	272
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	273 m_implicit_ctor_list.remove (cdef_cls);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	274 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	275 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	276 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	277 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	278 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	279
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	280 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	281 cdef_class::cdef_class_rep::load_all_methods (void)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	282 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	283 // FIXME: re-scan class directory
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	284 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	285
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	286 Cell
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	287 cdef_class::cdef_class_rep::get_methods (bool include_ctor)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	288 {
30390 a61e1a0f6024 maint: style check C++ files in libinterp/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30259 diff changeset	289 std::map<std::string, cdef_method> meths;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	290
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	291 find_methods (meths, false, include_ctor);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	292
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	293 Cell c (meths.size (), 1);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	294
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	295 int idx = 0;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	296
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	297 for (const auto& nm_mthd : meths)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	298 c(idx++, 0) = to_ov (nm_mthd.second);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	299
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	300 return c;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	301 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	302
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	303 std::map<std::string, cdef_method>
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	304 cdef_class::cdef_class_rep::get_method_map (bool only_inherited,
fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	305 bool include_ctor)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	306 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	307 std::map<std::string, cdef_method> methods;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	308
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	309 find_methods (methods, only_inherited, include_ctor);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	310
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	311 return methods;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	312 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	313
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	314 void
30346 91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	315 cdef_class::cdef_class_rep::find_methods (std::map<std::string,
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	316 cdef_method>& meths,
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	317 bool only_inherited,
b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	318 bool include_ctor)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	319 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	320 load_all_methods ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	321
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	322 method_const_iterator it;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	323
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	324 for (it = m_method_map.begin (); it != m_method_map.end (); ++it)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	325 {
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	326 if (include_ctor \|\| ! it->second.is_constructor ())
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	327 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	328 std::string nm = it->second.get_name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	329
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	330 if (meths.find (nm) == meths.end ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	331 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	332 if (only_inherited)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	333 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	334 octave_value acc = it->second.get ("Access");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	335
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	336 if (! acc.is_string ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	337 \|\| acc.string_value () == "private")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	338 continue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	339 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	340
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	341 meths[nm] = it->second;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	342 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	343 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	344 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	345
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	346 // Look into superclasses
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	347
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	348 Cell super_classes = get ("SuperClasses").cell_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	349
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	350 for (int i = 0; i < super_classes.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	351 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	352 cdef_class cls = lookup_class (super_classes(i));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	353
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	354 cls.get_rep ()->find_methods (meths, true, false);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	355 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	356 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	357
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	358 cdef_property
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	359 cdef_class::cdef_class_rep::find_property (const std::string& nm)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	360 {
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	361 auto it = m_property_map.find (nm);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	362
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	363 if (it != m_property_map.end ())
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	364 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	365 cdef_property& prop = it->second;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	366
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	367 if (prop.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	368 return prop;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	369 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	370
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	371 // Look into superclasses
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	372
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	373 Cell super_classes = get ("SuperClasses").cell_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	374
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	375 for (int i = 0; i < super_classes.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	376 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	377 cdef_class cls = lookup_class (super_classes(i));
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	378
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	379 cdef_property prop = cls.find_property (nm);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	380
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	381 if (prop.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	382 return prop;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	383 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	384
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	385 return cdef_property ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	386 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	387
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	388 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	389 cdef_class::cdef_class_rep::install_property (const cdef_property& prop)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	390 {
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	391 m_property_map[prop.get_name ()] = prop;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	392
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	393 m_member_count++;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	394 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	395
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	396 Cell
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	397 cdef_class::cdef_class_rep::get_properties (int mode)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	398 {
30390 a61e1a0f6024 maint: style check C++ files in libinterp/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30259 diff changeset	399 std::map<std::string, cdef_property> props;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	400
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	401 props = get_property_map (mode);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	402
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	403 Cell c (props.size (), 1);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	404
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	405 int idx = 0;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	406
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	407 for (const auto& pname_prop : props)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	408 c(idx++, 0) = to_ov (pname_prop.second);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	409
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	410 return c;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	411 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	412
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	413 std::map<std::string, cdef_property>
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	414 cdef_class::cdef_class_rep::get_property_map (int mode)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	415 {
30390 a61e1a0f6024 maint: style check C++ files in libinterp/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30259 diff changeset	416 std::map<std::string, cdef_property> props;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	417
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	418 find_properties (props, mode);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	419
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	420 return props;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	421 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	422
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	423 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	424 cdef_class::cdef_class_rep::find_properties (std::map<std::string,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	425 cdef_property>& props,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	426 int mode)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	427 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	428 property_const_iterator it;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	429
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	430 for (it = m_property_map.begin (); it != m_property_map.end (); ++it)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	431 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	432 std::string nm = it->second.get_name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	433
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	434 if (props.find (nm) == props.end ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	435 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	436 if (mode == property_inherited)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	437 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	438 octave_value acc = it->second.get ("GetAccess");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	439
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	440 if (! acc.is_string ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	441 \|\| acc.string_value () == "private")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	442 continue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	443 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	444
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	445 props[nm] = it->second;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	446 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	447 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	448
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	449 // Look into superclasses
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	450
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	451 Cell super_classes = get ("SuperClasses").cell_value ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	452
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	453 for (int i = 0; i < super_classes.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	454 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	455 cdef_class cls = lookup_class (super_classes(i));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	456
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	457 cls.get_rep ()->find_properties (props,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	458 (mode == property_all
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	459 ? property_all
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	460 : property_inherited));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	461 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	462 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	463
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	464 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	465 cdef_class::cdef_class_rep::find_names (std::set<std::string>& names,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	466 bool all)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	467 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	468 load_all_methods ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	469
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	470 for (const auto& cls_fnmap : m_method_map)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	471 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	472 if (! cls_fnmap.second.is_constructor ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	473 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	474 std::string nm = cls_fnmap.second.get_name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	475
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	476 if (! all)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	477 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	478 octave_value acc = cls_fnmap.second.get ("Access");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	479
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	480 if (! acc.is_string()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	481 \|\| acc.string_value () != "public")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	482 continue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	483 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	484
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	485 names.insert (nm);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	486 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	487 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	488
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	489 for (const auto& pname_prop : m_property_map)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	490 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	491 std::string nm = pname_prop.second.get_name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	492
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	493 if (! all)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	494 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	495 octave_value acc = pname_prop.second.get ("GetAccess");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	496
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	497 if (! acc.is_string()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	498 \|\| acc.string_value () != "public")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	499 continue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	500 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	501
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	502 names.insert (nm);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	503 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	504
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	505 // Look into superclasses
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	506
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	507 Cell super_classes = get ("SuperClasses").cell_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	508
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	509 for (int i = 0; i < super_classes.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	510 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	511 cdef_class cls = lookup_class (super_classes(i));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	512
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	513 cls.get_rep ()->find_names (names, all);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	514 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	515 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	516
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	517 string_vector
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	518 cdef_class::cdef_class_rep::get_names (void)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	519 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	520 std::set<std::string> names;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	521
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	522 find_names (names, false);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	523
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	524 string_vector v (names);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	525
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	526 return v.sort (true);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	527 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	528
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	529 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	530 cdef_class::cdef_class_rep::delete_object (const cdef_object& obj)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	531 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	532 cdef_method dtor = find_method ("delete");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	533
26926 71724787d972 don't call inherited delete methods (bug #53956) John W. Eaton <jwe@octave.org> parents: 26847 diff changeset	534 // FIXME: would it be better to tell find_method above to not find
71724787d972 don't call inherited delete methods (bug #53956) John W. Eaton <jwe@octave.org> parents: 26847 diff changeset	535 // overloaded functions?
71724787d972 don't call inherited delete methods (bug #53956) John W. Eaton <jwe@octave.org> parents: 26847 diff changeset	536
71724787d972 don't call inherited delete methods (bug #53956) John W. Eaton <jwe@octave.org> parents: 26847 diff changeset	537 if (dtor.ok () && dtor.is_defined_in_class (get_name ()))
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	538 dtor.execute (obj, octave_value_list (), 0, true, "destructor");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	539
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	540 // FIXME: should we destroy corresponding properties here?
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	541
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	542 // Call "delete" in super classes
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	543
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	544 Cell super_classes = get ("SuperClasses").cell_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	545
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	546 for (int i = 0; i < super_classes.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	547 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	548 cdef_class cls = lookup_class (super_classes(i));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	549
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	550 if (cls.get_name () != "handle")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	551 cls.delete_object (obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	552 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	553 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	554
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	555 octave_value_list
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	556 cdef_class::cdef_class_rep::meta_subsref (const std::string& type,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	557 const std::list<octave_value_list>& idx,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	558 int nargout)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	559 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	560 std::size_t skip = 1;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	561
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	562 octave_value_list retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	563
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	564 switch (type[0])
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	565 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	566 case '(':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	567 // Constructor call
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	568
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	569 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	570 std::cerr << "constructor" << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	571 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	572
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	573 retval(0) = construct (idx.front ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	574 break;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	575
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	576 case '.':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	577 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	578 // Static method, constant (or property?)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	579
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	580 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	581 std::cerr << "static method/property" << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	582 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	583
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	584 if (idx.front ().length () != 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	585 error ("invalid meta.class indexing");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	586
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	587 std::string nm = idx.front ()(0).xstring_value ("invalid meta.class indexing, expected a method or property name");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	588
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	589 cdef_method meth = find_method (nm);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	590
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	591 if (meth.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	592 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	593 if (! meth.is_static ())
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27189 diff changeset	594 error ("method '%s' is not static", nm.c_str ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	595
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	596 octave_value_list args;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	597
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	598 if (type.length () > 1 && idx.size () > 1 && type[1] == '(')
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	599 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	600 args = *(++(idx.begin ()));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	601 skip++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	602 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	603
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	604 retval = meth.execute (args, (type.length () > skip
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	605 ? 1 : nargout), true,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	606 "meta.class");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	607 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	608 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	609 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	610 cdef_property prop = find_property (nm);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	611
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	612 if (! prop.ok ())
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27189 diff changeset	613 error ("no such method or property '%s'", nm.c_str ());
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	614
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	615 if (! prop.is_constant ())
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27189 diff changeset	616 error ("property '%s' is not constant", nm.c_str ());
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	617
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	618 retval(0) = prop.get_value (true, "meta.class");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	619 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	620 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	621 break;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	622
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	623 default:
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	624 error ("invalid meta.class indexing");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	625 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	626 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	627
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	628 if (type.length () > skip && idx.size () > skip && ! retval.empty ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	629 retval = retval(0).next_subsref (nargout, type, idx, skip);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	630
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	631 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	632 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	633
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	634 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	635 cdef_class::cdef_class_rep::meta_release (void)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	636 {
31105 670a0d878af1 eliminate WHO arguments from interpreter-private functions John W. Eaton <jwe@octave.org> parents: 30565 diff changeset	637 cdef_manager& cdm = __get_cdef_manager__ ();
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	638
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	639 cdm.unregister_class (wrap ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	640 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	641
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	642 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	643 cdef_class::cdef_class_rep::initialize_object (cdef_object& obj)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	644 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	645 // Populate the object with default property values
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	646
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	647 std::list<cdef_class> super_classes
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	648 = lookup_classes (get ("SuperClasses").cell_value ());
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	649
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	650 for (auto& cls : super_classes)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	651 cls.initialize_object (obj);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	652
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	653 for (const auto& pname_prop : m_property_map)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	654 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	655 if (! pname_prop.second.get ("Dependent").bool_value ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	656 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	657 octave_value pvalue = pname_prop.second.get ("DefaultValue");
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	658
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	659 if (pvalue.is_defined ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	660 obj.put (pname_prop.first, pvalue);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	661 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	662 obj.put (pname_prop.first, octave_value (Matrix ()));
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	663 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	664 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	665
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	666 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	667 obj.mark_for_construction (cdef_class (this));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	668 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	669
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	670 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	671 cdef_class::cdef_class_rep::run_constructor (cdef_object& obj,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	672 const octave_value_list& args)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	673 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	674 octave_value_list empty_args;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	675
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	676 for (const auto& cls : m_implicit_ctor_list)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	677 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	678 cdef_class supcls = lookup_class (cls);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	679
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	680 supcls.run_constructor (obj, empty_args);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	681 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	682
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	683 std::string cls_name = get_name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	684 std::string ctor_name = get_base_name (cls_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	685
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	686 cdef_method ctor = find_method (ctor_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	687
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	688 if (ctor.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	689 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	690 octave_value_list ctor_args (args);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	691 octave_value_list ctor_retval;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	692
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	693 ctor_args.prepend (to_ov (obj));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	694 ctor_retval = ctor.execute (ctor_args, 1, true, "constructor");
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	695
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	696 if (ctor_retval.length () != 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	697 error ("%s: invalid number of output arguments for classdef constructor",
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	698 ctor_name.c_str ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	699
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	700 obj = to_cdef (ctor_retval(0));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	701 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	702
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	703 obj.mark_as_constructed (wrap ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	704 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	705
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	706 octave_value
26975 de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	707 cdef_class::cdef_class_rep::get_method (const std::string& name) const
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	708 {
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	709 auto p = m_method_map.find (name);
26975 de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	710
30075 0e0cc2760540 maint: use "m_" prefix for member variables in some classdef classes. John W. Eaton <jwe@octave.org> parents: 29690 diff changeset	711 if (p == m_method_map.end ())
26975 de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	712 return octave_value ();
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	713
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	714 return p->second.get_function ();
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	715 }
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	716
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	717
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	718 octave_value
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	719 cdef_class::cdef_class_rep::construct (const octave_value_list& args)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	720 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	721 cdef_object obj = construct_object (args);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	722
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	723 if (obj.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	724 return to_ov (obj);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	725
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	726 return octave_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	727 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	728
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	729 cdef_object
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	730 cdef_class::cdef_class_rep::construct_object (const octave_value_list& args)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	731 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	732 if (is_abstract ())
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27189 diff changeset	733 error ("cannot instantiate object for abstract class '%s'",
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	734 get_name ().c_str ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	735
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	736 cdef_object obj;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	737
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	738 if (is_meta_class ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	739 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	740 // This code path is only used to create empty meta objects
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	741 // as filler for the empty values within a meta object array.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	742
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	743 cdef_class this_cls = wrap ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	744
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	745 static cdef_object empty_class;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	746
31105 670a0d878af1 eliminate WHO arguments from interpreter-private functions John W. Eaton <jwe@octave.org> parents: 30565 diff changeset	747 cdef_manager& cdm = __get_cdef_manager__ ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	748
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	749 if (this_cls == cdm.meta_class ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	750 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	751 if (! empty_class.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	752 empty_class = cdm.make_class ("", std::list<cdef_class> ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	753 obj = empty_class;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	754 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	755 else if (this_cls == cdm.meta_property ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	756 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	757 static cdef_property empty_property;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	758
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	759 if (! empty_class.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	760 empty_class = cdm.make_class ("", std::list<cdef_class> ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	761 if (! empty_property.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	762 empty_property = cdm.make_property (empty_class, "");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	763 obj = empty_property;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	764 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	765 else if (this_cls == cdm.meta_method ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	766 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	767 static cdef_method empty_method;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	768
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	769 if (! empty_class.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	770 empty_class = cdm.make_class ("", std::list<cdef_class> ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	771 if (! empty_method.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	772 empty_method = cdm.make_method (empty_class, "", octave_value ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	773 obj = empty_method;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	774 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	775 else if (this_cls == cdm.meta_package ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	776 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	777 static cdef_package empty_package;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	778
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	779 if (! empty_package.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	780 empty_package = cdm.make_package ("");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	781 obj = empty_package;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	782 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	783 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	784 panic_impossible ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	785
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	786 return obj;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	787 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	788 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	789 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	790 if (is_handle_class ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	791 obj = cdef_object (new handle_cdef_object ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	792 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	793 obj = cdef_object (new value_cdef_object ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	794 obj.set_class (wrap ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	795
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	796 initialize_object (obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	797
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	798 run_constructor (obj, args);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	799
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	800 return obj;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	801 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	802
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	803 return cdef_object ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	804 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	805
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	806 static octave_value
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	807 compute_attribute_value (tree_evaluator& tw,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	808 tree_classdef_attribute *t)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	809 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	810 tree_expression *expr = t->expression ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	811
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	812 if (expr)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	813 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	814 if (expr->is_identifier ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	815 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	816 std::string s = expr->name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	817
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	818 if (s == "public")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	819 return std::string ("public");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	820 else if (s == "protected")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	821 return std::string ("protected");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	822 else if (s == "private")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	823 return std::string ("private");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	824 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	825
27371 fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752) John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	826 return expr->evaluate (tw);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	827 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	828 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	829 return octave_value (true);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	830 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	831
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	832 template <typename T>
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	833 static std::string
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	834 attribute_value_to_string (T *t, octave_value v)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	835 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	836 if (v.is_string ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	837 return v.string_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	838 else if (t->expression ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	839 return t->expression ()->original_text ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	840 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	841 return "true";
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	842 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	843
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	844 cdef_class
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	845 cdef_class::make_meta_class (interpreter& interp,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	846 tree_classdef *t, bool is_at_folder)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	847 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	848 cdef_class retval;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	849
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	850 // Class creation
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	851
30259 03ff3f1020cf store file name in classdef class object John W. Eaton <jwe@octave.org> parents: 30141 diff changeset	852 std::string class_name = t->ident ()->name ();
03ff3f1020cf store file name in classdef class object John W. Eaton <jwe@octave.org> parents: 30141 diff changeset	853 std::string full_class_name = class_name;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	854 if (! t->package_name ().empty ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	855 full_class_name = t->package_name () + '.' + full_class_name;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	856
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	857 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	858 std::cerr << "class: " << full_class_name << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	859 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	860
27189 946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	861 // Push a dummy scope frame on the call stack that corresponds to
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	862 // the scope that was used when parsing classdef object. Without
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	863 // this, we may pick up stray values from the current scope when
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	864 // evaluating expressions found in things like attribute lists.
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	865
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	866 tree_evaluator& tw = interp.get_evaluator ();
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	867
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	868 tw.push_dummy_scope (full_class_name);
29253 28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 28857 diff changeset	869 unwind_action pop_scope (&tree_evaluator::pop_scope, &tw);
27189 946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	870
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	871 std::list<cdef_class> slist;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	872
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	873 if (t->superclass_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	874 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	875 for (auto& scls : (*t->superclass_list ()))
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	876 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	877 std::string sclass_name = (scls)->class_name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	878
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	879 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	880 std::cerr << "superclass: " << sclass_name << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	881 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	882
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	883 cdef_class sclass = lookup_class (sclass_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	884
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	885 if (sclass.get ("Sealed").bool_value ())
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27189 diff changeset	886 error ("'%s' cannot inherit from '%s', because it is sealed",
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	887 full_class_name.c_str (), sclass_name.c_str ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	888
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	889 slist.push_back (sclass);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	890 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	891 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	892
31105 670a0d878af1 eliminate WHO arguments from interpreter-private functions John W. Eaton <jwe@octave.org> parents: 30565 diff changeset	893 cdef_manager& cdm = __get_cdef_manager__ ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	894
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	895 retval = cdm.make_class (full_class_name, slist);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	896
28514 fab862fedf85 allow help to find docstrings for classdef classes and methods (bug #43047) John W. Eaton <jwe@octave.org> parents: 28439 diff changeset	897 retval.doc_string (t->doc_string ());
30259 03ff3f1020cf store file name in classdef class object John W. Eaton <jwe@octave.org> parents: 30141 diff changeset	898 retval.file_name (t->file_name ());
28514 fab862fedf85 allow help to find docstrings for classdef classes and methods (bug #43047) John W. Eaton <jwe@octave.org> parents: 28439 diff changeset	899
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	900 // Package owning this class
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	901
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	902 if (! t->package_name ().empty ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	903 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	904 cdef_package pack = cdm.find_package (t->package_name ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	905
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	906 if (pack.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	907 retval.put ("ContainingPackage", to_ov (pack));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	908 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	909
29690 f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	910 // FIXME: instead of attaching attributes here, pass them to
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	911 // cdef_manager::make_method. The classdef manager contains a meta
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	912 // object with a list of all valid properties that can be used to
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	913 // validate the attribute list (see bug #60593).
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	914
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	915 // Class attributes
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	916
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	917 if (t->attribute_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	918 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	919 for (const auto& attr : (*t->attribute_list ()))
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	920 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	921 std::string aname = attr->ident ()->name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	922 octave_value avalue = compute_attribute_value (tw, attr);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	923
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	924 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	925 std::cerr << "class attribute: " << aname << " = "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	926 << attribute_value_to_string (attr, avalue) << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	927 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	928
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	929 retval.put (aname, avalue);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	930 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	931 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	932
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	933 tree_classdef_body *b = t->body ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	934
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	935 if (b)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	936 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	937 // Keep track of the get/set accessor methods. They will be used
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	938 // later on when creating properties.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	939
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	940 std::map<std::string, octave_value> get_methods;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	941 std::map<std::string, octave_value> set_methods;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	942
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	943 // Method blocks
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	944
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	945 std::list<tree_classdef_methods_block *> mb_list = b->methods_list ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	946
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	947 load_path& lp = interp.get_load_path ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	948
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	949 for (auto& mb_p : mb_list)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	950 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	951 std::map<std::string, octave_value> amap;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	952
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	953 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	954 std::cerr << "method block" << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	955 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	956
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	957 // Method attributes
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	958
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	959 if (mb_p->attribute_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	960 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	961 for (auto& attr_p : *mb_p->attribute_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	962 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	963 std::string aname = attr_p->ident ()->name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	964 octave_value avalue = compute_attribute_value (tw, attr_p);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	965
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	966 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	967 std::cerr << "method attribute: " << aname << " = "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	968 << attribute_value_to_string (attr_p, avalue)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	969 << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	970 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	971
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	972 amap[aname] = avalue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	973 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	974 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	975
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	976 // Methods
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	977
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	978 if (mb_p->element_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	979 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	980 for (auto& mtd : *mb_p->element_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	981 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	982 std::string mname = mtd.function_value ()->name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	983 std::string mprefix = mname.substr (0, 4);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	984
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	985 if (mprefix == "get.")
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	986 get_methods[mname.substr (4)]
28439 e760fef2829c refactor octave_fcn_handle class John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	987 = make_fcn_handle (mtd, mname, full_class_name);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	988 else if (mprefix == "set.")
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	989 set_methods[mname.substr (4)]
28439 e760fef2829c refactor octave_fcn_handle class John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	990 = make_fcn_handle (mtd, mname, full_class_name);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	991 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	992 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	993 cdef_method meth = cdm.make_method (retval, mname, mtd);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	994
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	995 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	996 std::cerr << (mname == class_name ? "constructor"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	997 : "method")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	998 << ": " << mname << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	999 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1000
29690 f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1001 // FIXME: instead of attaching attributes here,
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1002 // pass them to cdef_manager::make_method. The
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1003 // classdef manager contains a meta object with
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1004 // a list of all valid properties that can be
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1005 // used to validate the attribute list (see bug
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1006 // #60593).
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1007
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1008 for (auto& attrnm_val : amap)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1009 meth.put (attrnm_val.first, attrnm_val.second);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1010
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1011 retval.install_method (meth);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1012 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1013 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1014 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1015 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1016
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1017 if (is_at_folder)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1018 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1019 // Look for all external methods visible on octave path at the
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1020 // time of loading of the class.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1021 //
30346 91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	1022 // FIXME: This is an "extension" to Matlab behavior, which only
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	1023 // looks in the @-folder containing the original classdef file.
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	1024 // However, this is easier to implement it that way at the moment.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1025
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1026 std::list<std::string> external_methods
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1027 = lp.methods (full_class_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1028
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1029 for (const auto& mtdnm : external_methods)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1030 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1031 // FIXME: should we issue a warning if the method is already
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1032 // defined in the classdef file?
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1033
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1034 if (mtdnm != class_name
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1035 && ! retval.find_method (mtdnm, true).ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1036 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1037 // Create a dummy method that is used until the actual
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1038 // method is loaded.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1039 octave_user_function *fcn = new octave_user_function ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1040
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1041 fcn->stash_function_name (mtdnm);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1042
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1043 cdef_method meth
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1044 = cdm.make_method (retval, mtdnm, octave_value (fcn));
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1045
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1046 retval.install_method (meth);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1047 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1048 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1049 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1050
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1051 // Property blocks
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1052
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1053 // FIXME: default property expression should be able to call static
30346 91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	1054 // methods of the class being constructed. A restricted
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	1055 // CLASSNAME symbol should be added to the scope before
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	1056 // evaluating default value expressions.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1057
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1058 std::list<tree_classdef_properties_block *> pb_list
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1059 = b->properties_list ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1060
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1061 for (auto& pb_p : pb_list)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1062 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1063 std::map<std::string, octave_value> amap;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1064
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1065 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1066 std::cerr << "property block" << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1067 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1068
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1069 // Property attributes
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1070
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1071 if (pb_p->attribute_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1072 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1073 for (auto& attr_p : *pb_p->attribute_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1074 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1075 std::string aname = attr_p->ident ()->name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1076 octave_value avalue = compute_attribute_value (tw, attr_p);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1077
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1078 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1079 std::cerr << "property attribute: " << aname << " = "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1080 << attribute_value_to_string (attr_p, avalue)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1081 << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1082 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1083
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1084 if (aname == "Access")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1085 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1086 amap["GetAccess"] = avalue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1087 amap["SetAccess"] = avalue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1088 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1089 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1090 amap[aname] = avalue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1091 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1092 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1093
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1094 // Properties
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1095
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1096 if (pb_p->element_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1097 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1098 for (auto& prop_p : *pb_p->element_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1099 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1100 std::string prop_name = prop_p->ident ()->name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1101
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1102 cdef_property prop = cdm.make_property (retval, prop_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1103
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1104 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1105 std::cerr << "property: " << prop_p->ident ()->name ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1106 << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1107 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1108
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1109 tree_expression *expr = prop_p->expression ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1110 if (expr)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1111 {
27371 fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752) John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1112 octave_value pvalue = expr->evaluate (tw);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1113
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1114 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1115 std::cerr << "property default: "
27146 c776d553c19e * cdef-class.cc: Repair debug code. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26975 diff changeset	1116 << attribute_value_to_string (prop_p, pvalue)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1117 << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1118 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1119
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1120 prop.put ("DefaultValue", pvalue);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1121 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1122
29690 f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1123 // FIXME: instead of attaching attributes here, pass
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1124 // them to cdef_manager::make_property. The
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1125 // classdef manager contains a meta object with a
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1126 // list of all valid properties that can be used to
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1127 // validate the attribute list (see bug #60593).
f625b7670c0e * cdef-class.cc: Comments about possible way to fix bug #60593. John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1128
30346 91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	1129 // Install property attributes. This is done before
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	1130 // assigning the property accessors so we can do validation
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	1131 // by using cdef_property methods.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1132
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1133 for (auto& attrnm_val : amap)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1134 prop.put (attrnm_val.first, attrnm_val.second);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1135
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1136 // Install property access methods, if any. Remove the
30346 91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	1137 // accessor methods from the temporary storage map, so we
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	1138 // can detect which ones are invalid and do not correspond
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30259 diff changeset	1139 // to a defined property.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1140
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1141 auto git = get_methods.find (prop_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1142
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1143 if (git != get_methods.end ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1144 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1145 make_function_of_class (retval, git->second);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1146 prop.put ("GetMethod", git->second);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1147 get_methods.erase (git);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1148 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1149
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1150 auto sit = set_methods.find (prop_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1151
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1152 if (sit != set_methods.end ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1153 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1154 make_function_of_class (retval, sit->second);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1155 prop.put ("SetMethod", sit->second);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1156 set_methods.erase (sit);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1157 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1158
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1159 retval.install_property (prop);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1160 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1161 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1162 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1163 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1164
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1165 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1166 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1167
27505 c409d16b7190 eliminate some uses of bare pointers to octave_function objects John W. Eaton <jwe@octave.org> parents: 27445 diff changeset	1168 octave_value
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1169 cdef_class::get_method_function (const std::string& /* nm */)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1170 {
27505 c409d16b7190 eliminate some uses of bare pointers to octave_function objects John W. Eaton <jwe@octave.org> parents: 27445 diff changeset	1171 return octave_value (new octave_classdef_meta (*this));
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1172 }
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 31105 diff changeset	1173
e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 31105 diff changeset	1174 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libinterp/octave-value/cdef-class.cc @ 31605:e88a07dec498 stable