Mercurial > octave-nkf
view libgui/src/module.mk @ 15896:57be060d7672 classdef
Implement full object construction and superclass references.
* libinterp/octave-value/ov-classdef.h (cdef_object_rep::subsref): Add class
context argument.
(cdef_object_rep::ctor_list): New class member.
(cdef_object_rep::mark_for_construction, cdef_object_rep::is_constructed_for,
cdef_object_rep::is_partially_constructed_for,
cdef_object_rep::mark_as_constructed, cdef_object_rep::is_constructed,
cdef_object::mark_for_construction, cdef_object::is_constructed_for,
cdef_object::is_partially_constructed_for, cdef_object::mark_as_constructed,
cdef_object:is_constructed): New methods to manipulate the new ctor_list
class member.
(cdef_object_rep::cdef_object_rep (const cdef_object_rep&)): New copy
constructor.
(cdef_class::cdef_class_rep (std::string, std::list<cdef_class>)): New
utility constructor.
(cdef_class (std::string, std::list<cdef_class>)): Likewise.
(cdef_class::cdef_class_rep::implicit_ctor_list): New class member.
(cdef_method::cdef_method_rep::is_constructor, cdef_method::is_construcror):
New methods.
(cdef_method::get_function): Likewise.
(cdef_package::cdef_package_rep::subsref): Remove method.
(octave_classdef::get_object_ref): New method.
(to_cdef_ref): New function.
* libinterp/octave-value/ov-classdef.cc (is_superclass): Add max_depth argument.
(is_direct_superclass): New utility function.
(get_class_context): Add bool and std::string return values, as new reference
arguments. Add overload without any arguments.
(check_access): Check for valid class context when required.
(make_class): Remove super_name_list argument. Do not set SuperClasses
explicitly, use new cdef_class constructor instead.
(octave_classdef::subsref): Change skip variable to size_t (avoids compilation
warning). Call cdef_object::subsref with additional class context argument.
(class octave_classdef_superclass_ref): New utility class.
(F__superclass_reference__): Use it.
(cdef_object_rep::subsref): Add class context argument.
(cdef_object_rep::mark_for_construction): New method.
(handle_cdef_object::~handle_cdef_object, value_cdef_object::~value_cdef_object,
cdef_class::cdef_class_rep::subsref_meta, cdef_class::make_meta_class): Use gnulib::printf explicitly.
(cdef_class::cdef_class_rep (std::string, std::list<cdef_class>)): New
constructor.
(class ctor_analyzer): New utility class.
(cdef_class::cdef_class_rep::install_method): Use it to analyze constructors
and detect explicit superclass constructor calls.
(cdef_class::cdef_class_rep::initialize_object): Call
cdef_object::mark_for_construction.
(cdef_class::cdef_class_rep::run_constructor): Run all implicit superclass
constructors first.
(cdef_class::cdef_class_rep::construct): Call cdef_object::mark_as_constructed.
(cdef_class::make_meta_class): Remove snamelist variable.
(cdef_property::cdef_property_rep::get_value,
cdef_property::cdef_property_rep::set_value): Check if object is partially
constructed for the property-defining class.
(cdef_method::cdef_method_rep::is_constructor): New method.
(cdef_package::cdef_package_rep::subsref): Delete method.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Thu, 03 Jan 2013 21:01:11 -0500 |
parents | 06832c90ae7d |
children | c3057d80cf91 |
line wrap: on
line source
EXTRA_DIST += \ src/module.mk \ src/resource.qrc \ $(octave_gui_UI) \ $(octave_gui_ICONS) octave_gui_ICONS = \ src/icons/arrow_right.png \ src/icons/artsbuilderexecute.png \ src/icons/bookmark.png \ src/icons/bp_next.png \ src/icons/bp_prev.png \ src/icons/bp_rm_all.png \ src/icons/bp_toggle.png \ src/icons/chat.png \ src/icons/configure.png \ src/icons/db_cont.png \ src/icons/db_step_in.png \ src/icons/db_step_out.png \ src/icons/db_step.png \ src/icons/db_stop.png \ src/icons/editcopy.png \ src/icons/editcut.png \ src/icons/editpaste.png \ src/icons/filenew.png \ src/icons/fileopen.png \ src/icons/filesaveas.png \ src/icons/filesave.png \ src/icons/find.png \ src/icons/graphic_logo_DocumentationDockWidget.png \ src/icons/graphic_logo_FileEditor.png \ src/icons/graphic_logo_FilesDockWidget.png \ src/icons/graphic_logo_HistoryDockWidget.png \ src/icons/graphic_logo_TerminalDockWidget.png \ src/icons/graphic_logo_WorkspaceView.png \ src/icons/help_index.png \ src/icons/icons_license \ src/icons/jabber_protocol.png \ src/icons/letter_logo_DocumentationDockWidget.png \ src/icons/letter_logo_FileEditor.png \ src/icons/letter_logo_FilesDockWidget.png \ src/icons/letter_logo_HistoryDockWidget.png \ src/icons/letter_logo_TerminalDockWidget.png \ src/icons/letter_logo_WorkspaceView.png \ src/icons/logo.png \ src/icons/question.png \ src/icons/redled.png \ src/icons/redo.png \ src/icons/search.png \ src/icons/star.png \ src/icons/stop.png \ src/icons/terminal.png \ src/icons/undo.png \ src/icons/up.png \ src/icons/zoom-in.png \ src/icons/zoom-out.png octave_gui_MOC = \ src/m-editor/moc-file-editor-interface.cc \ src/m-editor/moc-file-editor-tab.cc \ src/m-editor/moc-file-editor.cc \ src/m-editor/moc-find-dialog.cc \ src/m-editor/moc-lexer-octave-gui.cc \ src/moc-documentation-dockwidget.cc \ src/moc-files-dockwidget.cc \ src/moc-history-dockwidget.cc \ src/moc-main-window.cc \ src/moc-octave-qt-event-listener.cc \ src/moc-settings-dialog.cc \ src/moc-terminal-dockwidget.cc \ src/moc-welcome-wizard.cc \ src/moc-workspace-model.cc \ src/moc-workspace-view.cc \ src/octave-adapter/moc-octave-main-thread.cc \ src/qtinfo/moc-parser.cc \ src/qtinfo/moc-webinfo.cc octave_gui_RC = src/qrc-resource.cc octave_gui_UI = \ src/settings-dialog.ui \ src/welcome-wizard.ui octave_gui_UI_H = $(patsubst src/%.ui, src/ui-%.h, $(octave_gui_UI)) BUILT_SOURCES += $(octave_gui_UI_H) noinst_HEADERS += \ src/documentation-dockwidget.h \ src/files-dockwidget.h \ src/history-dockwidget.h \ src/m-editor/file-editor-interface.h \ src/m-editor/file-editor-tab.h \ src/m-editor/file-editor.h \ src/m-editor/find-dialog.h \ src/m-editor/lexer-octave-gui.h \ src/main-window.h \ src/octave-adapter/octave-event-listener.h \ src/octave-adapter/octave-link.h \ src/octave-adapter/octave-main-thread.h \ src/octave-gui.h \ src/octave-qt-event-listener.h \ src/qtinfo/parser.h \ src/qtinfo/webinfo.h \ src/resource-manager.h \ src/settings-dialog.h \ src/symbol-information.h \ src/terminal-dockwidget.h \ src/welcome-wizard.h \ src/workspace-model.h \ src/workspace-view.h src_libgui_src_la_SOURCES = \ src/documentation-dockwidget.cc \ src/files-dockwidget.cc \ src/history-dockwidget.cc \ src/m-editor/file-editor-tab.cc \ src/m-editor/file-editor.cc \ src/m-editor/find-dialog.cc \ src/m-editor/lexer-octave-gui.cc \ src/main-window.cc \ src/octave-adapter/octave-link.cc \ src/octave-adapter/octave-main-thread.cc \ src/octave-gui.cc \ src/octave-qt-event-listener.cc \ src/qtinfo/parser.cc \ src/qtinfo/webinfo.cc \ src/resource-manager.cc \ src/settings-dialog.cc \ src/symbol-information.cc \ src/terminal-dockwidget.cc \ src/welcome-wizard.cc \ src/workspace-model.cc \ src/workspace-view.cc nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) src_libgui_src_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ @OCTGUI_DLL_DEFS@ \ @QT_CPPFLAGS@ \ -I$(srcdir)/qterminal/libqterminal \ -Isrc -I$(srcdir)/src \ -I$(srcdir)/src/m-editor \ -I$(srcdir)/src/octave-adapter \ -I$(srcdir)/src/qtinfo \ -I$(top_srcdir)/liboctave/cruft/misc \ -I$(top_srcdir)/liboctave/array \ -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \ -I$(top_builddir)/liboctave/operators -I$(top_srcdir)/liboctave/operators \ -I$(top_srcdir)/liboctave/system \ -I$(top_srcdir)/liboctave/util \ -I$(top_builddir)/libinterp -I$(top_srcdir)/libinterp \ -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \ -I$(top_builddir)/libinterp/interp-core -I$(top_srcdir)/libinterp/interp-core \ -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ -I$(top_srcdir)/libinterp/octave-value src_libgui_src_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) src_libgui_src_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) noinst_LTLIBRARIES += src/libgui-src.la CLEANFILES += \ $(octave_gui_MOC) \ $(octave_gui_UI_H) \ $(octave_gui_RC)