Mercurial > octave-nkf
changeset 19895:19755f4fc851
maint: Cleanup C++ code to follow Octave coding conventions.
Try to wrap long lines to < 80 characters.
Use GNU style and don't indent first brace of function definition.
"case" statement is aligned flush left with brace of switch stmt.
Remove trailing '\' line continuation from the end of #define macros.
Use 2 spaces for indent.
* files-dock-widget.cc, history-dock-widget.cc, main-window.cc, octave-cmd.cc,
octave-dock-widget.cc, octave-gui.cc, resource-manager.cc, settings-dialog.cc,
shortcut-manager.cc, welcome-wizard.cc, workspace-view.cc, cellfun.cc, data.cc,
debug.cc, debug.h, dirfns.cc, error.h, file-io.cc, gl-render.cc, gl-render.h,
gl2ps-renderer.h, graphics.cc, graphics.in.h, help.cc, input.cc, load-path.cc,
load-path.h, lookup.cc, lu.cc, oct-stream.cc, octave-default-image.h,
ordschur.cc, pr-output.cc, qz.cc, strfns.cc, symtab.cc, symtab.h, sysdep.cc,
variables.cc, zfstream.h, __fltk_uigetfile__.cc, __init_fltk__.cc,
__magick_read__.cc, __osmesa_print__.cc, audiodevinfo.cc, ov-classdef.cc,
ov-classdef.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-java.cc,
ov-range.cc, ov-re-mat.cc, ov-usr-fcn.h, ov.cc, op-int.h, options-usage.h,
pt-eval.cc, Array-C.cc, Array-fC.cc, Array.cc, Array.h, PermMatrix.cc,
Sparse.cc, chMatrix.h, dSparse.cc, dim-vector.h, bsxfun-decl.h, bsxfun-defs.cc,
oct-norm.cc, Sparse-op-defs.h, oct-inttypes.cc, oct-inttypes.h, main.in.cc,
mkoctfile.in.cc: Cleanup C++ code to follow Octave coding conventions.
line wrap: on
line diff
--- a/libgui/src/files-dock-widget.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libgui/src/files-dock-widget.cc Wed Feb 25 11:55:49 2015 -0800 @@ -199,7 +199,8 @@ _file_tree_view->setSortingEnabled (true); _file_tree_view->setAlternatingRowColors (true); _file_tree_view->setAnimated (true); - _file_tree_view->setToolTip (tr ("Activate to open in editor, right click for alternatives")); + _file_tree_view->setToolTip ( + tr ("Activate to open in editor, right click for alternatives")); // get sort column and order as well as cloumn state (order and width)
--- a/libgui/src/history-dock-widget.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libgui/src/history-dock-widget.cc Wed Feb 25 11:55:49 2015 -0800 @@ -284,7 +284,8 @@ { if (_history_list_view->hasFocus ()) handle_contextmenu_copy (true); - if (_filter->lineEdit ()->hasFocus () && _filter->lineEdit ()->hasSelectedText ()) + if (_filter->lineEdit ()->hasFocus () + && _filter->lineEdit ()->hasSelectedText ()) { QClipboard *clipboard = QApplication::clipboard (); clipboard->setText ( _filter->lineEdit ()->selectedText ()); @@ -308,10 +309,10 @@ { if (_filter->lineEdit ()->hasFocus ()) { - _filter->lineEdit ()->selectAll (); + _filter->lineEdit ()->selectAll (); } if (_history_list_view->hasFocus ()) { - _history_list_view->selectAll (); + _history_list_view->selectAll (); } }
--- a/libgui/src/main-window.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libgui/src/main-window.cc Wed Feb 25 11:55:49 2015 -0800 @@ -1574,11 +1574,11 @@ { QHash<QMenu*, QStringList>::const_iterator i = _hash_menu_text.constBegin(); - while (i != _hash_menu_text.constEnd()) - { - i.key ()->setTitle (i.value ().at (! enable)); - ++i; - } + while (i != _hash_menu_text.constEnd()) + { + i.key ()->setTitle (i.value ().at (! enable)); + ++i; + } } QMenu* @@ -1812,7 +1812,7 @@ widget, SLOT (setVisible (bool))); connect (widget, SIGNAL (active_changed (bool)), - action, SLOT (setChecked (bool))); + action, SLOT (setChecked (bool))); } else { @@ -2059,7 +2059,7 @@ octave_cmd *cmd = _cmd_queue.takeFirst (); if (_cmd_queue.isEmpty ()) - _cmd_processing.release (); // cmd queue empty, processing will stop + _cmd_processing.release (); // cmd queue empty, processing will stop else repost = true; // not empty, repost at end _cmd_queue_mutex.unlock (); @@ -2189,7 +2189,8 @@ { // this slot is called when editor gets/loses focus if (editor_has_focus) - { // disable shortcuts that are also provided by the editor itself + { + // disable shortcuts that are also provided by the editor itself QKeySequence no_key = QKeySequence (); _copy_action->setShortcut (no_key); _paste_action->setShortcut (no_key); @@ -2197,7 +2198,8 @@ _select_all_action->setShortcut (no_key); } else - { // editor loses focus, set the global shortcuts + { + // editor loses focus, set the global shortcuts shortcut_manager::set_shortcut (_copy_action, "main_edit:copy"); shortcut_manager::set_shortcut (_paste_action, "main_edit:paste"); shortcut_manager::set_shortcut (_undo_action, "main_edit:undo"); @@ -2216,8 +2218,10 @@ shortcut_manager::set_shortcut (_new_script_action, "main_file:new_file"); shortcut_manager::set_shortcut (_new_function_action, "main_file:new_function"); shortcut_manager::set_shortcut (_new_function_action, "main_file:new_figure"); - shortcut_manager::set_shortcut (_load_workspace_action, "main_file:load_workspace"); - shortcut_manager::set_shortcut (_save_workspace_action, "main_file:save_workspace"); + shortcut_manager::set_shortcut (_load_workspace_action, + "main_file:load_workspace"); + shortcut_manager::set_shortcut (_save_workspace_action, + "main_file:save_workspace"); shortcut_manager::set_shortcut (_preferences_action, "main_file:preferences"); shortcut_manager::set_shortcut (_exit_action,"main_file:exit"); @@ -2226,11 +2230,15 @@ shortcut_manager::set_shortcut (_paste_action, "main_edit:paste"); shortcut_manager::set_shortcut (_undo_action, "main_edit:undo"); shortcut_manager::set_shortcut (_select_all_action, "main_edit:select_all"); - shortcut_manager::set_shortcut (_clear_clipboard_action, "main_edit:clear_clipboard"); + shortcut_manager::set_shortcut (_clear_clipboard_action, + "main_edit:clear_clipboard"); shortcut_manager::set_shortcut (_find_files_action, "main_edit:find_in_files"); - shortcut_manager::set_shortcut (_clear_command_history_action, "main_edit:clear_history"); - shortcut_manager::set_shortcut (_clear_command_window_action, "main_edit:clear_command_window"); - shortcut_manager::set_shortcut (_clear_workspace_action, "main_edit:clear_workspace"); + shortcut_manager::set_shortcut (_clear_command_history_action, + "main_edit:clear_history"); + shortcut_manager::set_shortcut (_clear_command_window_action, + "main_edit:clear_command_window"); + shortcut_manager::set_shortcut (_clear_workspace_action, + "main_edit:clear_workspace"); // debug menu shortcut_manager::set_shortcut (_debug_step_over, "main_debug:step_over"); @@ -2240,16 +2248,22 @@ shortcut_manager::set_shortcut (_debug_quit, "main_debug:quit"); // window menu - shortcut_manager::set_shortcut (_show_command_window_action, "main_window:show_command"); - shortcut_manager::set_shortcut (_show_history_action, "main_window:show_history"); - shortcut_manager::set_shortcut (_show_workspace_action, "main_window:show_workspace"); - shortcut_manager::set_shortcut (_show_file_browser_action, "main_window:show_file_browser"); + shortcut_manager::set_shortcut (_show_command_window_action, + "main_window:show_command"); + shortcut_manager::set_shortcut (_show_history_action, + "main_window:show_history"); + shortcut_manager::set_shortcut (_show_workspace_action, + "main_window:show_workspace"); + shortcut_manager::set_shortcut (_show_file_browser_action, + "main_window:show_file_browser"); shortcut_manager::set_shortcut (_show_editor_action, "main_window:show_editor"); - shortcut_manager::set_shortcut (_show_documentation_action, "main_window:show_doc"); + shortcut_manager::set_shortcut (_show_documentation_action, + "main_window:show_doc"); shortcut_manager::set_shortcut (_command_window_action, "main_window:command"); shortcut_manager::set_shortcut (_history_action, "main_window:history"); shortcut_manager::set_shortcut (_workspace_action, "main_window:workspace"); - shortcut_manager::set_shortcut (_file_browser_action, "main_window:file_browser"); + shortcut_manager::set_shortcut (_file_browser_action, + "main_window:file_browser"); shortcut_manager::set_shortcut (_editor_action, "main_window:editor"); shortcut_manager::set_shortcut (_documentation_action, "main_window:doc"); shortcut_manager::set_shortcut (_reset_windows_action, "main_window:reset"); @@ -2265,8 +2279,10 @@ shortcut_manager::set_shortcut (_about_octave_action, "main_help:about"); // news menu - shortcut_manager::set_shortcut (_release_notes_action, "main_news:release_notes"); - shortcut_manager::set_shortcut (_current_news_action, "main_news:community_news"); + shortcut_manager::set_shortcut (_release_notes_action, + "main_news:release_notes"); + shortcut_manager::set_shortcut (_current_news_action, + "main_news:community_news"); } void @@ -2279,11 +2295,13 @@ return; if (set_shortcuts) - { // terminal loses focus: set the global shortcuts + { + // terminal loses focus: set the global shortcuts configure_shortcuts (); } else - { // terminal gets focus: disable some shortcuts + { + // terminal gets focus: disable some shortcuts QKeySequence no_key = QKeySequence (); // file menu
--- a/libgui/src/octave-cmd.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libgui/src/octave-cmd.cc Wed Feb 25 11:55:49 2015 -0800 @@ -62,13 +62,15 @@ std::string pending_input = command_editor::get_current_line (); if (valid_identifier (function_name.toStdString ())) - { // valid identifier: call as function with possibility to debug + { + // valid identifier: call as function with possibility to debug std::string path = _info.absolutePath ().toStdString (); if (octave_qt_link::file_in_path (file_path, path)) - Feval (ovl (function_name.toStdString ())); + Feval (ovl (function_name.toStdString ())); } else - { // no valid identifier: use Fsource (), no debug possible + { + // no valid identifier: use Fsource (), no debug possible Fsource (ovl (file_path)); }
--- a/libgui/src/octave-dock-widget.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libgui/src/octave-dock-widget.cc Wed Feb 25 11:55:49 2015 -0800 @@ -317,10 +317,10 @@ } QString background = - QString ("background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1," - " stop: 0 %1, stop: 0.75 %2, stop: 0.9 %2, stop: 1.0 %1);"). - arg (bg_col.lighter ().name ()). - arg (bg_col.name ()); + QString ("background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1," + " stop: 0 %1, stop: 0.75 %2, stop: 0.9 %2, stop: 1.0 %1);"). + arg (bg_col.lighter ().name ()). + arg (bg_col.name ()); #if defined (Q_OS_WIN32) css = background + QString (" color: %1 ;").arg (fg_col.name ()); @@ -359,8 +359,10 @@ css_button = QString ("background: transparent; border: 0px;"); _dock_button->setStyleSheet (css_button); _close_button->setStyleSheet (css_button); - _dock_action->setIcon (QIcon (":/actions/icons/" + dock_icon + icon_col + ".png")); - _close_action->setIcon (QIcon (":/actions/icons/widget-close" + dock_icon + icon_col + ".png")); + _dock_action->setIcon (QIcon (":/actions/icons/" + dock_icon + icon_col + + ".png")); + _close_action->setIcon (QIcon (":/actions/icons/widget-close" + dock_icon + + icon_col + ".png")); #else setStyleSheet (css); #endif @@ -374,28 +376,28 @@ QColor default_var = QColor (0,0,0); _fg_color = settings->value ("Dockwidgets/title_fg_color", - default_var).value<QColor> (); + default_var).value<QColor> (); default_var = QColor (0,0,0); _fg_color_active = settings->value ("Dockwidgets/title_fg_color_active", - default_var).value<QColor> (); + default_var).value<QColor> (); default_var = QColor (255,255,255); _bg_color = settings->value ("Dockwidgets/title_bg_color", - default_var).value<QColor> (); + default_var).value<QColor> (); default_var = QColor (192,192,192); _bg_color_active = settings->value ("Dockwidgets/title_bg_color_active", - default_var).value<QColor> (); + default_var).value<QColor> (); int r, g, b; _bg_color.getRgb (&r, &g, &b); if (r+g+b < 400) - _icon_color = "-light"; + _icon_color = "-light"; else _icon_color = ""; _bg_color_active.getRgb (&r, &g, &b); if (r+g+b < 400) - _icon_color_active = "-light"; + _icon_color_active = "-light"; else _icon_color_active = "";
--- a/libgui/src/octave-gui.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libgui/src/octave-gui.cc Wed Feb 25 11:55:49 2015 -0800 @@ -120,7 +120,8 @@ // show wizard if this is the first run if (resource_manager::is_first_run ()) { - resource_manager::config_translators (&qt_tr, &qsci_tr, &gui_tr); // before wizard + // before wizard + resource_manager::config_translators (&qt_tr, &qsci_tr, &gui_tr); application.installTranslator (&qt_tr); application.installTranslator (&qsci_tr); application.installTranslator (&gui_tr); @@ -136,7 +137,8 @@ { resource_manager::reload_settings (); // get settings file - resource_manager::config_translators (&qt_tr, &qsci_tr, &gui_tr); // after settings + // after settings + resource_manager::config_translators (&qt_tr, &qsci_tr, &gui_tr); application.installTranslator (&qt_tr); application.installTranslator (&qsci_tr); application.installTranslator (&gui_tr);
--- a/libgui/src/resource-manager.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libgui/src/resource-manager.cc Wed Feb 25 11:55:49 2015 -0800 @@ -232,10 +232,11 @@ && settings->isWritable () && settings->status () == QSettings::NoError)) { - QString msg = QString (QT_TR_NOOP ("The settings file\n%1\n" - "does not exist and can not be created.\n" - "Make sure you have read and write permissions to\n%2\n\n" - "Octave GUI must be closed now.")); + QString msg = QString (QT_TR_NOOP ( + "The settings file\n%1\n" + "does not exist and can not be created.\n" + "Make sure you have read and write permissions to\n%2\n\n" + "Octave GUI must be closed now.")); QMessageBox::critical (0, QString (QT_TR_NOOP ("Octave Critical Error")), msg.arg (do_get_settings_file ()).arg (do_get_settings_directory ())); exit (1);
--- a/libgui/src/settings-dialog.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libgui/src/settings-dialog.cc Wed Feb 25 11:55:49 2015 -0800 @@ -110,7 +110,7 @@ // custom title bar of dock widget QVariant default_var = QColor (255,255,255); QColor bg_color = settings->value ("Dockwidgets/title_bg_color", - default_var).value<QColor> (); + default_var).value<QColor> (); _widget_title_bg_color = new color_picker (bg_color); _widget_title_bg_color->setEnabled (false); ui->layout_widget_bgtitle->addWidget (_widget_title_bg_color,0); @@ -128,7 +128,7 @@ default_var = QColor (0,0,0); QColor fg_color = settings->value ("Dockwidgets/title_fg_color", - default_var).value<QColor> (); + default_var).value<QColor> (); _widget_title_fg_color = new color_picker (fg_color); _widget_title_fg_color->setEnabled (false); ui->layout_widget_fgtitle->addWidget (_widget_title_fg_color,0); @@ -157,9 +157,9 @@ // Octave startup ui->cb_restore_octave_dir->setChecked ( - settings->value ("restore_octave_dir",false).toBool ()); + settings->value ("restore_octave_dir",false).toBool ()); ui->le_octave_dir->setText ( - settings->value ("octave_startup_dir").toString ()); + settings->value ("octave_startup_dir").toString ()); connect (ui->pb_octave_dir, SIGNAL (pressed ()), this, SLOT (get_octave_dir ())); @@ -262,11 +262,11 @@ // terminal ui->terminal_fontName->setCurrentFont (QFont ( - settings->value ("terminal/fontName","Courier New").toString ())); + settings->value ("terminal/fontName","Courier New").toString ())); ui->terminal_fontSize->setValue ( settings->value ("terminal/fontSize", 10).toInt ()); ui->terminal_history_buffer->setValue ( - settings->value ("terminal/history_buffer",1000).toInt ()); + settings->value ("terminal/history_buffer",1000).toInt ()); ui->terminal_cursorBlinking->setChecked ( settings->value ("terminal/cursorBlinking",true).toBool ()); ui->terminal_cursorUseForegroundColor->setChecked ( @@ -309,9 +309,9 @@ ui->sync_octave_directory->setChecked ( settings->value ("filesdockwidget/sync_octave_directory",true).toBool ()); ui->cb_restore_file_browser_dir->setChecked ( - settings->value ("filesdockwidget/restore_last_dir",false).toBool ()); + settings->value ("filesdockwidget/restore_last_dir",false).toBool ()); ui->le_file_browser_dir->setText ( - settings->value ("filesdockwidget/startup_dir").toString ()); + settings->value ("filesdockwidget/startup_dir").toString ()); connect (ui->pb_file_browser_dir, SIGNAL (pressed ()), this, SLOT (get_file_browser_dir ())); @@ -324,7 +324,7 @@ int currentIndex = 0; QString proxyTypeString = settings->value ("proxyType").toString (); while ((currentIndex < ui->proxyType->count ()) - && (ui->proxyType->currentText () != proxyTypeString)) + && (ui->proxyType->currentText () != proxyTypeString)) { currentIndex++; ui->proxyType->setCurrentIndex (currentIndex); @@ -1018,8 +1018,10 @@ if (! disable) { - ui->le_file_browser_dir->setDisabled (ui->cb_restore_file_browser_dir->isChecked ()); - ui->pb_file_browser_dir->setDisabled (ui->cb_restore_file_browser_dir->isChecked ()); + ui->le_file_browser_dir->setDisabled ( + ui->cb_restore_file_browser_dir->isChecked ()); + ui->pb_file_browser_dir->setDisabled ( + ui->cb_restore_file_browser_dir->isChecked ()); } else {
--- a/libgui/src/shortcut-manager.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libgui/src/shortcut-manager.cc Wed Feb 25 11:55:49 2015 -0800 @@ -170,13 +170,16 @@ init (tr ("Reset Window Layout"), "main_window:reset", QKeySequence ()); // help - init (tr ("Show Ondisk Documentation"), "main_help:ondisk_doc", QKeySequence ()); - init (tr ("Show Online Documentation"), "main_help:online_doc", QKeySequence ()); + init (tr ("Show Ondisk Documentation"), "main_help:ondisk_doc", + QKeySequence ()); + init (tr ("Show Online Documentation"), "main_help:online_doc", + QKeySequence ()); init (tr ("Report a Bug"), "main_help:report_bug", QKeySequence ()); init (tr ("Octave Packages"), "main_help:packages", QKeySequence ()); init (tr ("Share Code"), "main_help:agora", QKeySequence ()); init (tr ("Contribute to Octave"), "main_help:contribute", QKeySequence ()); - init (tr ("Octave Developer Resources"), "main_help:developer", QKeySequence ()); + init (tr ("Octave Developer Resources"), "main_help:developer", + QKeySequence ()); init (tr ("About Octave"), "main_help:about", QKeySequence ()); // news @@ -273,11 +276,15 @@ QKeySequence ()); // view - init (tr ("Show Line Numbers"), "editor_view:show_line_numbers", QKeySequence ()); - init (tr ("Show White Spaces"), "editor_view:show_white_spaces", QKeySequence ()); + init (tr ("Show Line Numbers"), "editor_view:show_line_numbers", + QKeySequence ()); + init (tr ("Show White Spaces"), "editor_view:show_white_spaces", + QKeySequence ()); init (tr ("Show Line Endings"), "editor_view:show_eol_chars", QKeySequence ()); - init (tr ("Show Indentation Guides"), "editor_view:show_ind_guides", QKeySequence ()); - init (tr ("Show Long Line Marker"), "editor_view:show_long_line", QKeySequence ()); + init (tr ("Show Indentation Guides"), "editor_view:show_ind_guides", + QKeySequence ()); + init (tr ("Show Long Line Marker"), "editor_view:show_long_line", + QKeySequence ()); init (tr ("Zoom In"), "editor_view:zoom_in", QKeySequence::ZoomIn); init (tr ("Zoom Out"), "editor_view:zoom_out", QKeySequence::ZoomOut); #if defined (Q_OS_MAC) @@ -305,15 +312,19 @@ QKeySequence (prefix + Qt::Key_F9) ); // help - init (tr ("Help on Keyword"), "editor_help:help_keyword", QKeySequence::HelpContents); - init (tr ("Document on Keyword"), "editor_help:doc_keyword", QKeySequence (Qt::SHIFT + Qt::Key_F1)); + init (tr ("Help on Keyword"), "editor_help:help_keyword", + QKeySequence::HelpContents); + init (tr ("Document on Keyword"), "editor_help:doc_keyword", + QKeySequence (Qt::SHIFT + Qt::Key_F1)); } void shortcut_manager::init (QString description, QString key, QKeySequence def_sc) { - QKeySequence actual_0 = QKeySequence (_settings->value ("shortcuts/"+key, def_sc).toString ()); - QKeySequence actual_1 = QKeySequence (_settings->value ("shortcuts/"+key+"_1", def_sc).toString ()); + QKeySequence actual_0 + = QKeySequence (_settings->value ("shortcuts/"+key, def_sc).toString ()); + QKeySequence actual_1 + = QKeySequence (_settings->value ("shortcuts/"+key+"_1", def_sc).toString ()); // append the new shortcut to the list shortcut_t shortcut_info; @@ -328,9 +339,11 @@ // insert shortcut prepended by widget in order check for duplicates later QString widget = key.section ('_',0,0); // get widget that uses the shortcut if (! actual_0.isEmpty ()) - _shortcut_hash[widget + ":" + actual_0.toString ()] = _sc.count (); // offset of 1 to avoid 0 + _shortcut_hash[widget + ":" + actual_0.toString ()] = + _sc.count (); // offset of 1 to avoid 0 if (! actual_1.isEmpty ()) - _shortcut_hash[widget + "_1:" + actual_1.toString ()] = _sc.count (); // offset of 1 to avoid 0 + _shortcut_hash[widget + "_1:" + actual_1.toString ()] = + _sc.count (); // offset of 1 to avoid 0 _action_hash[key] = _sc.count (); // offset of 1 to avoid 0 } @@ -419,7 +432,8 @@ // write one or all actual shortcut set(s) into a settings file void -shortcut_manager::do_write_shortcuts (int set, QSettings* settings, bool closing) +shortcut_manager::do_write_shortcuts (int set, QSettings* settings, + bool closing) { if (set) { @@ -440,7 +454,7 @@ settings->setValue("shortcuts/"+_sc.at (i).settings_key, _sc.at (i).actual_sc[0].toString ()); settings->setValue("shortcuts/"+_sc.at (i).settings_key+"_1", - _sc.at (i).actual_sc[1].toString ()); + _sc.at (i).actual_sc[1].toString ()); } if (closing) @@ -477,13 +491,13 @@ { switch (col) { - case 2: - case 4: - _selected_set = col/2 - 1; - break; + case 2: + case 4: + _selected_set = col/2 - 1; + break; - default: - return; + default: + return; } int i = _item_index_hash[item]; @@ -511,7 +525,8 @@ help->setWordWrap (true); box->addWidget (help); - QCheckBox *direct = new QCheckBox (tr ("Enter shortcut directly by performing it")); + QCheckBox *direct = new QCheckBox ( + tr ("Enter shortcut directly by performing it")); direct->setCheckState (Qt::Checked); box->addWidget (direct); @@ -604,7 +619,8 @@ shortcut_t shortcut = _sc.at (_handled_index); if (! shortcut.actual_sc[_selected_set].isEmpty ()) - _shortcut_hash.remove (widget + sep + shortcut.actual_sc[_selected_set].toString ()); + _shortcut_hash.remove (widget + sep + + shortcut.actual_sc[_selected_set].toString ()); shortcut.actual_sc[_selected_set] = _edit_actual->text(); _sc.replace (_handled_index, shortcut); @@ -613,7 +629,7 @@ if (! shortcut.actual_sc[_selected_set].isEmpty ()) _shortcut_hash[widget + sep + shortcut.actual_sc[_selected_set].toString ()] = - _handled_index + 1; + _handled_index + 1; } void @@ -719,13 +735,13 @@ Qt::KeyboardModifiers modifiers = e->modifiers (); - if(modifiers & Qt::ShiftModifier) + if (modifiers & Qt::ShiftModifier) key += Qt::SHIFT; - if(modifiers & Qt::ControlModifier) + if (modifiers & Qt::ControlModifier) key += Qt::CTRL; - if(modifiers & Qt::AltModifier) + if (modifiers & Qt::AltModifier) key += Qt::ALT; - if(modifiers & Qt::MetaModifier) + if (modifiers & Qt::MetaModifier) key += Qt::META; setText (QKeySequence(key));
--- a/libgui/src/welcome-wizard.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libgui/src/welcome-wizard.cc Wed Feb 25 11:55:49 2015 -0800 @@ -45,224 +45,224 @@ initial_page::initial_page (welcome_wizard *wizard) - : QWidget (wizard), - title (new QLabel (tr ("Welcome to Octave!"), this)), - message (new QLabel (this)), - logo (make_octave_logo (this)), - next (new QPushButton (tr ("Next"), this)), - cancel (new QPushButton (tr ("Cancel"), this)) - { - QFont ft; - ft.setPointSize (20); - title->setFont (ft); + : QWidget (wizard), + title (new QLabel (tr ("Welcome to Octave!"), this)), + message (new QLabel (this)), + logo (make_octave_logo (this)), + next (new QPushButton (tr ("Next"), this)), + cancel (new QPushButton (tr ("Cancel"), this)) +{ + QFont ft; + ft.setPointSize (20); + title->setFont (ft); - message->setText - (tr ("<html><body>\n" - "<p>You seem to be using the Octave graphical interface for the first time on this computer.\n" - "Click 'Next' to create a configuration file and launch Octave.</p>\n" - "<p>The configuration file is stored in<br>%1.</p>\n" - "</body></html>"). - arg (resource_manager::get_settings_file ())); - message->setWordWrap (true); - message->setMinimumWidth (400); + message->setText + (tr ("<html><body>\n" + "<p>You seem to be using the Octave graphical interface for the first time on this computer.\n" + "Click 'Next' to create a configuration file and launch Octave.</p>\n" + "<p>The configuration file is stored in<br>%1.</p>\n" + "</body></html>"). + arg (resource_manager::get_settings_file ())); + message->setWordWrap (true); + message->setMinimumWidth (400); - QVBoxLayout *message_layout = new QVBoxLayout; + QVBoxLayout *message_layout = new QVBoxLayout; - message_layout->addWidget (title); - message_layout->addWidget (message); + message_layout->addWidget (title); + message_layout->addWidget (message); - QHBoxLayout *message_and_logo = new QHBoxLayout; + QHBoxLayout *message_and_logo = new QHBoxLayout; - message_and_logo->addLayout (message_layout); - message_and_logo->addStretch (10); - message_and_logo->addWidget (logo, 0, Qt::AlignTop); + message_and_logo->addLayout (message_layout); + message_and_logo->addStretch (10); + message_and_logo->addWidget (logo, 0, Qt::AlignTop); - QHBoxLayout *button_bar = new QHBoxLayout; + QHBoxLayout *button_bar = new QHBoxLayout; - button_bar->addStretch (10); - button_bar->addWidget (next); - button_bar->addWidget (cancel); + button_bar->addStretch (10); + button_bar->addWidget (next); + button_bar->addWidget (cancel); - QVBoxLayout *page_layout = new QVBoxLayout (this); - setLayout (page_layout); + QVBoxLayout *page_layout = new QVBoxLayout (this); + setLayout (page_layout); - page_layout->addLayout (message_and_logo); - page_layout->addStretch (10); - page_layout->addLayout (button_bar); + page_layout->addLayout (message_and_logo); + page_layout->addStretch (10); + page_layout->addLayout (button_bar); - next->setDefault (true); - next->setFocus (); + next->setDefault (true); + next->setFocus (); - connect (next, SIGNAL (clicked ()), wizard, SLOT (next_page ())); - connect (cancel, SIGNAL (clicked ()), wizard, SLOT (reject ())); - } + connect (next, SIGNAL (clicked ()), wizard, SLOT (next_page ())); + connect (cancel, SIGNAL (clicked ()), wizard, SLOT (reject ())); +} setup_community_news::setup_community_news (welcome_wizard *wizard) - : QWidget (wizard), - title (new QLabel (tr ("Community News"), this)), - message (new QLabel (this)), - checkbox (new QCheckBox (this)), - checkbox_message (new QLabel (this)), - logo (make_octave_logo (this)), - previous (new QPushButton (tr ("Previous"), this)), - next (new QPushButton (tr ("Next"), this)), - cancel (new QPushButton (tr ("Cancel"), this)) - { - QFont ft; - ft.setPointSize (20); - title->setFont (ft); + : QWidget (wizard), + title (new QLabel (tr ("Community News"), this)), + message (new QLabel (this)), + checkbox (new QCheckBox (this)), + checkbox_message (new QLabel (this)), + logo (make_octave_logo (this)), + previous (new QPushButton (tr ("Previous"), this)), + next (new QPushButton (tr ("Next"), this)), + cancel (new QPushButton (tr ("Cancel"), this)) +{ + QFont ft; + ft.setPointSize (20); + title->setFont (ft); - message->setText - (tr ("<html><body>\n" - "<p>When the Octave GUI starts, it will check the Octave web site for current news and information about the Octave community.\n" - "The check will happen at most once each day and news will only be displayed if there is something new since the last time you viewed the news.</p>\n" - "<p>You may also view the news by selecting the \"Community News\" item in the \"Help\" menu in the GUI, or by visiting\n" - "<a href=\"http://octave.org/community-news.html\">http://octave.org/community-news.html</a>.</p>\n" - "</body></html>")); - message->setWordWrap (true); - message->setMinimumWidth (400); - message->setOpenExternalLinks (true); + message->setText + (tr ("<html><body>\n" + "<p>When the Octave GUI starts, it will check the Octave web site for current news and information about the Octave community.\n" + "The check will happen at most once each day and news will only be displayed if there is something new since the last time you viewed the news.</p>\n" + "<p>You may also view the news by selecting the \"Community News\" item in the \"Help\" menu in the GUI, or by visiting\n" + "<a href=\"http://octave.org/community-news.html\">http://octave.org/community-news.html</a>.</p>\n" + "</body></html>")); + message->setWordWrap (true); + message->setMinimumWidth (400); + message->setOpenExternalLinks (true); - QVBoxLayout *message_layout = new QVBoxLayout; + QVBoxLayout *message_layout = new QVBoxLayout; - message_layout->addWidget (title); - message_layout->addWidget (message); + message_layout->addWidget (title); + message_layout->addWidget (message); - QHBoxLayout *message_and_logo = new QHBoxLayout; + QHBoxLayout *message_and_logo = new QHBoxLayout; - message_and_logo->addLayout (message_layout); - message_and_logo->addStretch (10); - message_and_logo->addWidget (logo, 0, Qt::AlignTop); + message_and_logo->addLayout (message_layout); + message_and_logo->addStretch (10); + message_and_logo->addWidget (logo, 0, Qt::AlignTop); - QHBoxLayout *checkbox_layout = new QHBoxLayout; + QHBoxLayout *checkbox_layout = new QHBoxLayout; - checkbox->setCheckState (Qt::Checked); + checkbox->setCheckState (Qt::Checked); - checkbox_message->setText - (tr ("<html><head>\n" - "<style>\n" - "a:link { text-decoration: underline; color: #0000ff; }\n" - "</style>\n" - "<head/><body>\n" - "<p>Allow Octave to connect to the Octave web site when it starts to display current news and information about the Octave community.</p>\n" - "</body></html>")); - checkbox_message->setWordWrap (true); - checkbox_message->setOpenExternalLinks (true); - checkbox_message->setMinimumWidth (500); + checkbox_message->setText + (tr ("<html><head>\n" + "<style>\n" + "a:link { text-decoration: underline; color: #0000ff; }\n" + "</style>\n" + "<head/><body>\n" + "<p>Allow Octave to connect to the Octave web site when it starts to display current news and information about the Octave community.</p>\n" + "</body></html>")); + checkbox_message->setWordWrap (true); + checkbox_message->setOpenExternalLinks (true); + checkbox_message->setMinimumWidth (500); - checkbox_layout->addWidget (checkbox, 0, Qt::AlignTop); - checkbox_layout->addSpacing (20); - checkbox_layout->addWidget (checkbox_message, 0, Qt::AlignTop); - checkbox_layout->addStretch (10); + checkbox_layout->addWidget (checkbox, 0, Qt::AlignTop); + checkbox_layout->addSpacing (20); + checkbox_layout->addWidget (checkbox_message, 0, Qt::AlignTop); + checkbox_layout->addStretch (10); - QVBoxLayout *message_logo_and_checkbox = new QVBoxLayout; + QVBoxLayout *message_logo_and_checkbox = new QVBoxLayout; - message_logo_and_checkbox->addLayout (message_and_logo); - message_logo_and_checkbox->addSpacing (20); - message_logo_and_checkbox->addLayout (checkbox_layout); + message_logo_and_checkbox->addLayout (message_and_logo); + message_logo_and_checkbox->addSpacing (20); + message_logo_and_checkbox->addLayout (checkbox_layout); - QHBoxLayout *button_bar = new QHBoxLayout; + QHBoxLayout *button_bar = new QHBoxLayout; - button_bar->addStretch (10); - button_bar->addWidget (previous); - button_bar->addWidget (next); - button_bar->addWidget (cancel); + button_bar->addStretch (10); + button_bar->addWidget (previous); + button_bar->addWidget (next); + button_bar->addWidget (cancel); - QVBoxLayout *page_layout = new QVBoxLayout (this); - setLayout (page_layout); + QVBoxLayout *page_layout = new QVBoxLayout (this); + setLayout (page_layout); - page_layout->addLayout (message_logo_and_checkbox); - page_layout->addStretch (10); - page_layout->addLayout (button_bar); + page_layout->addLayout (message_logo_and_checkbox); + page_layout->addStretch (10); + page_layout->addLayout (button_bar); - next->setDefault (true); - next->setFocus (); + next->setDefault (true); + next->setFocus (); - connect (checkbox, SIGNAL (stateChanged (int)), - wizard, SLOT (handle_web_connect_option (int))); + connect (checkbox, SIGNAL (stateChanged (int)), + wizard, SLOT (handle_web_connect_option (int))); - connect (previous, SIGNAL (clicked ()), wizard, SLOT (previous_page ())); - connect (next, SIGNAL (clicked ()), wizard, SLOT (next_page ())); - connect (cancel, SIGNAL (clicked ()), wizard, SLOT (reject ())); - } + connect (previous, SIGNAL (clicked ()), wizard, SLOT (previous_page ())); + connect (next, SIGNAL (clicked ()), wizard, SLOT (next_page ())); + connect (cancel, SIGNAL (clicked ()), wizard, SLOT (reject ())); +} final_page::final_page (welcome_wizard *wizard) - : QWidget (wizard), - title (new QLabel (tr ("Enjoy!"), this)), - message (new QLabel (this)), - logo (make_octave_logo (this)), - links (new QLabel (this)), - previous (new QPushButton (tr ("Previous"), this)), - finish (new QPushButton (tr ("Finish"), this)), - cancel (new QPushButton (tr ("Cancel"), this)) - { - QFont ft; - ft.setPointSize (20); - title->setFont (ft); + : QWidget (wizard), + title (new QLabel (tr ("Enjoy!"), this)), + message (new QLabel (this)), + logo (make_octave_logo (this)), + links (new QLabel (this)), + previous (new QPushButton (tr ("Previous"), this)), + finish (new QPushButton (tr ("Finish"), this)), + cancel (new QPushButton (tr ("Cancel"), this)) +{ + QFont ft; + ft.setPointSize (20); + title->setFont (ft); - message->setText - (tr ("<html><body>\n" - "<p>We hope you find Octave to be a useful tool.</p>\n" - "<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels.\n" - "You can find more information about each of these by visiting <a href=\"http://octave.org/support.html\">http://octave.org/support.html</a> (opens in external browser).</p>\n" - "</body></html>")); - message->setWordWrap (true); - message->setMinimumWidth (400); - message->setOpenExternalLinks (true); + message->setText + (tr ("<html><body>\n" + "<p>We hope you find Octave to be a useful tool.</p>\n" + "<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels.\n" + "You can find more information about each of these by visiting <a href=\"http://octave.org/support.html\">http://octave.org/support.html</a> (opens in external browser).</p>\n" + "</body></html>")); + message->setWordWrap (true); + message->setMinimumWidth (400); + message->setOpenExternalLinks (true); - QVBoxLayout *message_layout = new QVBoxLayout; + QVBoxLayout *message_layout = new QVBoxLayout; - message_layout->addWidget (title); - message_layout->addWidget (message); + message_layout->addWidget (title); + message_layout->addWidget (message); - QHBoxLayout *message_and_logo = new QHBoxLayout; + QHBoxLayout *message_and_logo = new QHBoxLayout; - message_and_logo->addLayout (message_layout); - message_and_logo->addStretch (10); - message_and_logo->addWidget (logo, 0, Qt::AlignTop); + message_and_logo->addLayout (message_layout); + message_and_logo->addStretch (10); + message_and_logo->addWidget (logo, 0, Qt::AlignTop); - links->setText - (tr ("<html><head>\n" - "<style>\n" - "a:link { text-decoration: underline; color: #0000ff; }\n" - "</style>\n" - "<head/><body>\n" - "<p>For more information about Octave:</p>\n" - "<ul>\n" - "<li>Visit <a href=\"http://octave.org\">http://octave.org</a> (opens in external browser)</li>\n" - "<li>Get the documentation online as <a href=\"http://www.gnu.org/software/octave/doc/interpreter/index.html\">html</a>- or <a href=\"http://www.gnu.org/software/octave/octave.pdf\">pdf</span></a>-document (opens in external browser)</li>\n" - "<li>Open the documentation browser of the Octave GUI with the help menu</li>\n" - "</ul>\n" - "</body></html>")); - links->setWordWrap (true); - links->setOpenExternalLinks (true); + links->setText + (tr ("<html><head>\n" + "<style>\n" + "a:link { text-decoration: underline; color: #0000ff; }\n" + "</style>\n" + "<head/><body>\n" + "<p>For more information about Octave:</p>\n" + "<ul>\n" + "<li>Visit <a href=\"http://octave.org\">http://octave.org</a> (opens in external browser)</li>\n" + "<li>Get the documentation online as <a href=\"http://www.gnu.org/software/octave/doc/interpreter/index.html\">html</a>- or <a href=\"http://www.gnu.org/software/octave/octave.pdf\">pdf</span></a>-document (opens in external browser)</li>\n" + "<li>Open the documentation browser of the Octave GUI with the help menu</li>\n" + "</ul>\n" + "</body></html>")); + links->setWordWrap (true); + links->setOpenExternalLinks (true); - QHBoxLayout *button_bar = new QHBoxLayout; + QHBoxLayout *button_bar = new QHBoxLayout; - button_bar->addStretch (10); - button_bar->addWidget (previous); - button_bar->addWidget (finish); - button_bar->addWidget (cancel); + button_bar->addStretch (10); + button_bar->addWidget (previous); + button_bar->addWidget (finish); + button_bar->addWidget (cancel); - QVBoxLayout *page_layout = new QVBoxLayout (this); - setLayout (page_layout); + QVBoxLayout *page_layout = new QVBoxLayout (this); + setLayout (page_layout); - page_layout->addLayout (message_and_logo); - page_layout->addSpacing (20); - page_layout->addWidget (links); - page_layout->addStretch (10); - page_layout->addLayout (button_bar); + page_layout->addLayout (message_and_logo); + page_layout->addSpacing (20); + page_layout->addWidget (links); + page_layout->addStretch (10); + page_layout->addLayout (button_bar); - finish->setDefault (true); - finish->setFocus (); + finish->setDefault (true); + finish->setFocus (); - connect (previous, SIGNAL (clicked ()), wizard, SLOT (previous_page ())); - connect (finish, SIGNAL (clicked ()), wizard, SLOT (accept ())); - connect (cancel, SIGNAL (clicked ()), wizard, SLOT (reject ())); - } + connect (previous, SIGNAL (clicked ()), wizard, SLOT (previous_page ())); + connect (finish, SIGNAL (clicked ()), wizard, SLOT (accept ())); + connect (cancel, SIGNAL (clicked ()), wizard, SLOT (reject ())); +} welcome_wizard::welcome_wizard (QWidget *p)
--- a/libgui/src/workspace-view.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libgui/src/workspace-view.cc Wed Feb 25 11:55:49 2015 -0800 @@ -56,7 +56,7 @@ _filter->setMaxCount (MaxFilterHistory); _filter->setInsertPolicy (QComboBox::NoInsert); _filter->setSizeAdjustPolicy ( - QComboBox::AdjustToMinimumContentsLengthWithIcon); + QComboBox::AdjustToMinimumContentsLengthWithIcon); QSizePolicy sizePol (QSizePolicy::Expanding, QSizePolicy::Preferred); _filter->setSizePolicy (sizePol); _filter->completer ()->setCaseSensitivity (Qt::CaseSensitive); @@ -100,7 +100,7 @@ _filter->addItems (settings->value ("workspaceview/mru_list").toStringList ()); bool filter_state = - settings->value ("workspaceview/filter_active", false).toBool (); + settings->value ("workspaceview/filter_active", false).toBool (); _filter_checkbox->setChecked (filter_state); filter_activate (filter_state);
--- a/libinterp/corefcn/cellfun.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/cellfun.cc Wed Feb 25 11:55:49 2015 -0800 @@ -1240,8 +1240,9 @@ if (f -> is_overloaded ()) goto nevermind; } - octave_value f = symbol_table::find_function (func.function_value () - -> name ()); + octave_value f + = symbol_table::find_function (func.function_value () -> name ()); + if (f.is_defined ()) func = f; }
--- a/libinterp/corefcn/data.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/data.cc Wed Feb 25 11:55:49 2015 -0800 @@ -3672,7 +3672,7 @@ */ DEFUN (isscalar, args, , - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} isscalar (@var{x})\n\ Return true if @var{x} is a scalar.\n\ @seealso{isvector, ismatrix}\n\ @@ -3708,7 +3708,7 @@ */ DEFUN (isvector, args, , - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Function File} {} isvector (@var{x})\n\ Return true if @var{x} is a vector.\n\ \n\ @@ -3751,7 +3751,7 @@ */ DEFUN (isrow, args, , - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Function File} {} isrow (@var{x})\n\ Return true if @var{x} is a row vector 1xN with non-negative N.\n\ @seealso{iscolumn, isscalar, isvector, ismatrix}\n\ @@ -3801,7 +3801,7 @@ */ DEFUN (iscolumn, args, , - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Function File} {} iscolumn (@var{x})\n\ Return true if @var{x} is a column vector Nx1 with non-negative N.\n\ @seealso{isrow, isscalar, isvector, ismatrix}\n\ @@ -3898,7 +3898,7 @@ */ DEFUN (issquare, args, , - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Function File} {} issquare (@var{x})\n\ Return true if @var{x} is a square matrix.\n\ @seealso{isscalar, isvector, ismatrix, size}\n\
--- a/libinterp/corefcn/debug.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/debug.cc Wed Feb 25 11:55:49 2015 -0800 @@ -206,35 +206,35 @@ return; if (args(0).is_string ()) - { - // string could be function name or line number - int isint = atoi (args(0).string_value ().c_str ()); + { + // string could be function name or line number + int isint = atoi (args(0).string_value ().c_str ()); - if (error_state) - return; + if (error_state) + return; - if (isint == 0) - { - // It was a function name - symbol_name = args(0).string_value (); - if (error_state) - return; - idx = 1; - } - else - { - // It was a line number. Need to get function name from debugger. - if (Vdebugging) - { - symbol_name = get_user_code ()->name (); - idx = 0; - } - else - { - error ("%s: no function specified", who); - } - } - } + if (isint == 0) + { + // It was a function name + symbol_name = args(0).string_value (); + if (error_state) + return; + idx = 1; + } + else + { + // It was a line number. Need to get function name from debugger. + if (Vdebugging) + { + symbol_name = get_user_code ()->name (); + idx = 0; + } + else + { + error ("%s: no function specified", who); + } + } + } else if (args(0).is_map ()) { // This is a problem because parse_dbfunction_params() @@ -539,7 +539,9 @@ bp_table::do_remove_all_breakpoints (void) { // Odd loop structure required because delete will invalidate bp_set iterators - for (const_bp_set_iterator it=bp_set.begin (), it_next=it; it != bp_set.end (); it=it_next) + for (const_bp_set_iterator it=bp_set.begin (), it_next=it; + it != bp_set.end (); + it=it_next) { ++it_next; remove_all_breakpoints_in_file (*it); @@ -729,10 +731,10 @@ if (nargin == 1 && symbol_name == "all") bp_table::remove_all_breakpoints (); else - { - if (! error_state) - bp_table::remove_breakpoint (symbol_name, lines); - } + { + if (! error_state) + bp_table::remove_breakpoint (symbol_name, lines); + } return retval; } @@ -924,12 +926,12 @@ std::string text; while (std::getline (fs, text) && line <= end) - { - if (line >= start) - os << line << "\t" << text << "\n"; + { + if (line >= start) + os << line << "\t" << text << "\n"; - line++; - } + line++; + } } else os << "dbtype: unable to open '" << ff << "' for reading!\n";
--- a/libinterp/corefcn/debug.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/debug.h Wed Feb 25 11:55:49 2015 -0800 @@ -62,7 +62,7 @@ const intmap& lines = intmap ()) { return instance_ok () - ? instance->do_add_breakpoint (fname, lines) : intmap (); + ? instance->do_add_breakpoint (fname, lines) : intmap (); } // Remove a breakpoint from a line in file. @@ -70,7 +70,7 @@ const intmap& lines = intmap ()) { return instance_ok () - ? instance->do_remove_breakpoint (fname, lines) : 0; + ? instance->do_remove_breakpoint (fname, lines) : 0; } // Remove all the breakpoints in a specified file. @@ -78,7 +78,8 @@ bool silent = false) { return instance_ok () - ? instance->do_remove_all_breakpoints_in_file (fname, silent) : intmap (); + ? instance->do_remove_all_breakpoints_in_file (fname, silent) + : intmap (); } // Remove all the breakpoints registered with octave. @@ -94,7 +95,7 @@ get_breakpoint_list (const octave_value_list& fname_list) { return instance_ok () - ? instance->do_get_breakpoint_list (fname_list) : fname_line_map (); + ? instance->do_get_breakpoint_list (fname_list) : fname_line_map (); } static bool
--- a/libinterp/corefcn/dirfns.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/dirfns.cc Wed Feb 25 11:55:49 2015 -0800 @@ -666,7 +666,7 @@ */ DEFUN (__fnmatch__, args, , - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} fnmatch (@var{pattern}, @var{string})\n\ Return true or false for each element of @var{string} that matches any of\n\ the elements of the string array @var{pattern}, using the rules of\n\
--- a/libinterp/corefcn/error.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/error.h Wed Feb 25 11:55:49 2015 -0800 @@ -31,8 +31,7 @@ class unwind_protect; #define panic_impossible() \ - panic ("impossible state reached in file '%s' at line %d", \ - __FILE__, __LINE__) + panic ("impossible state reached in file '%s' at line %d", __FILE__, __LINE__) extern OCTINTERP_API void reset_error_handler (void);
--- a/libinterp/corefcn/file-io.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/file-io.cc Wed Feb 25 11:55:49 2015 -0800 @@ -1841,7 +1841,7 @@ } DEFUNX ("popen", Fpopen, args, , - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {@var{fid} =} popen (@var{command}, @var{mode})\n\ Start a process and create a pipe. The name of the command to run is\n\ given by @var{command}. The file identifier corresponding to the input\n\
--- a/libinterp/corefcn/gl-render.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/gl-render.cc Wed Feb 25 11:55:49 2015 -0800 @@ -38,14 +38,16 @@ #define LIGHT_MODE GL_FRONT_AND_BACK // Use symbolic names for axes -enum { +enum +{ X_AXIS, Y_AXIS, Z_AXIS }; // Use symbolic names for color mode -enum { +enum +{ UNIFORM, FLAT, INTERP, @@ -53,7 +55,8 @@ }; // Use symbolic names for lighting -enum { +enum +{ NONE, //FLAT, // Already declared in anonymous enum for color mode GOURAUD = 2
--- a/libinterp/corefcn/gl-render.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/gl-render.h Wed Feb 25 11:55:49 2015 -0800 @@ -68,17 +68,17 @@ virtual void draw (const graphics_object& go, bool toplevel = true); virtual void draw (const Matrix& hlist, bool toplevel = false) - { - int len = hlist.length (); + { + int len = hlist.length (); - for (int i = len-1; i >= 0; i--) - { - graphics_object obj = gh_manager::get_object (hlist(i)); + for (int i = len-1; i >= 0; i--) + { + graphics_object obj = gh_manager::get_object (hlist(i)); - if (obj) - draw (obj, toplevel); - } - } + if (obj) + draw (obj, toplevel); + } + } virtual void set_viewport (int w, int h); virtual graphics_xform get_transform (void) const { return xform; } @@ -150,27 +150,27 @@ #if HAVE_FREETYPE , text_renderer () #endif - { } + { } opengl_renderer& operator = (const opengl_renderer&) - { return *this; } + { return *this; } bool is_nan_or_inf (double x, double y, double z) const - { - return (xisnan (x) || xisnan (y) || xisnan (z) - || xisinf (x) || xisinf (y) || xisinf (z)); - } + { + return (xisnan (x) || xisnan (y) || xisnan (z) + || xisinf (x) || xisinf (y) || xisinf (z)); + } octave_uint8 clip_code (double x, double y, double z) const - { - return ((x < xmin ? 1 : 0) - | (x > xmax ? 1 : 0) << 1 - | (y < ymin ? 1 : 0) << 2 - | (y > ymax ? 1 : 0) << 3 - | (z < zmin ? 1 : 0) << 4 - | (z > zmax ? 1 : 0) << 5 - | (is_nan_or_inf (x, y, z) ? 0 : 1) << 6); - } + { + return ((x < xmin ? 1 : 0) + | (x > xmax ? 1 : 0) << 1 + | (y < ymin ? 1 : 0) << 2 + | (y > ymax ? 1 : 0) << 3 + | (z < zmin ? 1 : 0) << 4 + | (z > zmax ? 1 : 0) << 5 + | (is_nan_or_inf (x, y, z) ? 0 : 1) << 6); + } unsigned int make_marker_list (const std::string& m, double size, bool filled) const;
--- a/libinterp/corefcn/gl2ps-renderer.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/gl2ps-renderer.h Wed Feb 25 11:55:49 2015 -0800 @@ -76,7 +76,7 @@ gl2psDisable (GL2PS_POLYGON_OFFSET_FILL); opengl_renderer::set_polygon_offset (on, offset); } - } + } void set_linewidth (float w) {
--- a/libinterp/corefcn/graphics.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/graphics.cc Wed Feb 25 11:55:49 2015 -0800 @@ -1347,7 +1347,7 @@ // check dimensional size constraints until a match is found for (std::list<dim_vector>::const_iterator it = size_constraints.begin (); - ! xok && it != size_constraints.end ();++it) + ! xok && it != size_constraints.end (); ++it) { dim_vector itdims = (*it); @@ -3175,9 +3175,9 @@ base_graphics_object::build_user_defaults_map (property_list::pval_map_type &def, const std::string go_name) const { property_list local_defaults = get_defaults_list (); - property_list::plist_map_const_iterator p = + property_list::plist_map_const_iterator p = local_defaults.find (go_name); - + if (p != local_defaults.end ()) { property_list::pval_map_type pval = p->second; @@ -3199,16 +3199,16 @@ void base_graphics_object::reset_default_properties (void) - { - if (valid_object ()) - { - property_list::pval_map_type factory_pval = - gh_manager::get_object (0).get_factory_defaults_list () - .find (type ())->second; - - xreset_default_properties (get_handle (), factory_pval); - } - } +{ + if (valid_object ()) + { + property_list::pval_map_type factory_pval = + gh_manager::get_object (0).get_factory_defaults_list () + .find (type ())->second; + + xreset_default_properties (get_handle (), factory_pval); + } +} std::string base_graphics_object::values_as_string (void)
--- a/libinterp/corefcn/graphics.in.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/graphics.in.h Wed Feb 25 11:55:49 2015 -0800 @@ -1730,7 +1730,7 @@ if (t1 != t2) is_ok = false; - + if (t1 == t3) add_hidden = false; } @@ -2001,7 +2001,7 @@ class pval_vector : public std::vector <pval_pair> { - public: +public: const_iterator find (const std::string pname) const { const_iterator it; @@ -2031,7 +2031,7 @@ const_iterator it = find (pname); if (it != (*this).end ()) - retval = (*it).second; + retval = (*it).second; return retval; } @@ -2716,7 +2716,7 @@ else error ("base_graphics_object::override_defaults: invalid graphics object"); } - + void build_user_defaults_map (property_list::pval_map_type &def, const std::string go_name) const; @@ -2772,7 +2772,7 @@ error ("base_graphics_object::get_defaults: invalid graphics object"); return octave_value (); } - + virtual property_list get_defaults_list (void) const { if (! valid_object ()) @@ -4094,24 +4094,24 @@ } void update_font (void); - void update_fontname (void) - { - update_font (); + void update_fontname (void) + { + update_font (); sync_positions (); } - void update_fontsize (void) - { - update_font (); + void update_fontsize (void) + { + update_font (); sync_positions (); } - void update_fontangle (void) - { - update_font (); + void update_fontangle (void) + { + update_font (); sync_positions (); } - void update_fontweight (void) - { - update_font (); + void update_fontweight (void) + { + update_font (); sync_positions (); } @@ -4684,22 +4684,22 @@ protected: void init (void) - { - xdata.add_constraint (2); - ydata.add_constraint (2); - cdata.add_constraint ("double"); - cdata.add_constraint ("single"); - cdata.add_constraint ("logical"); - cdata.add_constraint ("uint8"); - cdata.add_constraint ("uint16"); - cdata.add_constraint ("int16"); - cdata.add_constraint ("real"); - cdata.add_constraint (dim_vector (-1, -1)); - cdata.add_constraint (dim_vector (-1, -1, 3)); - alphadata.add_constraint (dim_vector (-1, -1)); - alphadata.add_constraint ("double"); - alphadata.add_constraint ("uint8"); - } + { + xdata.add_constraint (2); + ydata.add_constraint (2); + cdata.add_constraint ("double"); + cdata.add_constraint ("single"); + cdata.add_constraint ("logical"); + cdata.add_constraint ("uint8"); + cdata.add_constraint ("uint16"); + cdata.add_constraint ("int16"); + cdata.add_constraint ("real"); + cdata.add_constraint (dim_vector (-1, -1)); + cdata.add_constraint (dim_vector (-1, -1, 3)); + alphadata.add_constraint (dim_vector (-1, -1)); + alphadata.add_constraint ("double"); + alphadata.add_constraint ("uint8"); + } private: void update_alphadata (void) @@ -4856,10 +4856,10 @@ // Matlab allows incoherent data to be stored into patch properties. // The patch should then be ignored by the renderer. bool has_bad_data (std::string &msg) const - { - msg = bad_data_msg; - return ! msg.empty (); - } + { + msg = bad_data_msg; + return ! msg.empty (); + } bool is_aliminclude (void) const { return (aliminclude.is_on () && alphadatamapping.is ("scaled")); } @@ -5546,9 +5546,9 @@ protected: void init (void) - { - position.add_constraint (dim_vector (1, 4)); - } + { + position.add_constraint (dim_vector (1, 4)); + } void update_units (const caseless_str& old_units); void update_fontunits (const caseless_str& old_units);
--- a/libinterp/corefcn/help.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/help.cc Wed Feb 25 11:55:49 2015 -0800 @@ -108,55 +108,55 @@ const static pair_type operators[] = { pair_type ("!", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} !\n\ Logical 'not' operator.\n\ @seealso{~, not}\n\ @end deftypefn"), pair_type ("~", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} ~\n\ Logical 'not' operator.\n\ @seealso{!, not}\n\ @end deftypefn"), pair_type ("!=", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} !=\n\ Logical 'not equals' operator.\n\ @seealso{~=, ne}\n\ @end deftypefn"), pair_type ("~=", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} ~=\n\ Logical 'not equals' operator.\n\ @seealso{!=, ne}\n\ @end deftypefn"), pair_type ("\"", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} \"\n\ String delimiter.\n\ @end deftypefn"), pair_type ("#", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} #\n\ Begin comment character.\n\ @seealso{%, #@\\{}\n\ @end deftypefn"), pair_type ("%", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} %\n\ Begin comment character.\n\ @seealso{#, %@\\{}\n\ @end deftypefn"), pair_type ("#{", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} #@{\n\ Begin block comment. There must be nothing else, other than\n\ whitespace, in the line both before and after @code{#@{}.\n\ @@ -165,7 +165,7 @@ @end deftypefn"), pair_type ("%{", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} %@{\n\ Begin block comment. There must be nothing else, other than\n\ whitespace, in the line both before and after @code{%@{}.\n\ @@ -174,7 +174,7 @@ @end deftypefn"), pair_type ("#}", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} #@}\n\ Close block comment. There must be nothing else, other than\n\ whitespace, in the line both before and after @code{#@}}.\n\ @@ -183,7 +183,7 @@ @end deftypefn"), pair_type ("%}", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} %@}\n\ Close block comment. There must be nothing else, other than\n\ whitespace, in the line both before and after @code{%@}}.\n\ @@ -192,27 +192,27 @@ @end deftypefn"), pair_type ("...", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} ...\n\ Continuation marker. Joins current line with following line.\n\ @end deftypefn"), pair_type ("&", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} &\n\ Element by element logical 'and' operator.\n\ @seealso{&&, and}\n\ @end deftypefn"), pair_type ("&&", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} &&\n\ Logical 'and' operator (with short-circuit evaluation).\n\ @seealso{&, and}\n\ @end deftypefn"), pair_type ("'", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} '\n\ Matrix transpose operator. For complex matrices, computes the\n\ complex conjugate (Hermitian) transpose.\n\ @@ -224,26 +224,26 @@ @end deftypefn"), pair_type ("(", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} (\n\ Array index or function argument delimiter.\n\ @end deftypefn"), pair_type (")", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {})\n\ Array index or function argument delimiter.\n\ @end deftypefn"), pair_type ("*", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} *\n\ Multiplication operator.\n\ @seealso{.*, times}\n\ @end deftypefn"), pair_type ("**", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} **\n\ Power operator. This may return complex results for real inputs. Use\n\ @code{realsqrt}, @code{cbrt}, @code{nthroot}, or @code{realroot} to obtain\n\ @@ -252,7 +252,7 @@ @end deftypefn"), pair_type ("^", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} ^\n\ Power operator. This may return complex results for real inputs. Use\n\ @code{realsqrt}, @code{cbrt}, @code{nthroot}, or @code{realroot} to obtain\n\ @@ -261,14 +261,14 @@ @end deftypefn"), pair_type ("+", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} +\n\ Addition operator.\n\ @seealso{plus}\n\ @end deftypefn"), pair_type ("++", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} ++\n\ Increment operator. As in C, may be applied as a prefix or postfix\n\ operator.\n\ @@ -276,20 +276,20 @@ @end deftypefn"), pair_type (",", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} ,\n\ Array index, function argument, or command separator.\n\ @end deftypefn"), pair_type ("-", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} -\n\ Subtraction or unary negation operator.\n\ @seealso{minus}\n\ @end deftypefn"), pair_type ("--", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} --\n\ Decrement operator. As in C, may be applied as a prefix or postfix\n\ operator.\n\ @@ -297,7 +297,7 @@ @end deftypefn"), pair_type (".'", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} .'\n\ Matrix transpose operator. For complex matrices, computes the\n\ transpose, @emph{not} the complex conjugate transpose.\n\ @@ -305,14 +305,14 @@ @end deftypefn"), pair_type (".*", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} .*\n\ Element by element multiplication operator.\n\ @seealso{*, times}\n\ @end deftypefn"), pair_type (".**", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} .*\n\ Element by element power operator. If several complex results are possible,\n\ returns the one with smallest non-negative argument (angle). Use\n\ @@ -322,7 +322,7 @@ @end deftypefn"), pair_type (".^", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} .^\n\ Element by element power operator. If several complex results are possible,\n\ returns the one with smallest non-negative argument (angle). Use\n\ @@ -332,110 +332,110 @@ @end deftypefn"), pair_type ("./", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} ./\n\ Element by element right division operator.\n\ @seealso{/, .\\, rdivide, mrdivide}\n\ @end deftypefn"), pair_type ("/", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} /\n\ Right division operator.\n\ @seealso{./, \\, rdivide, mrdivide}\n\ @end deftypefn"), pair_type (".\\", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} .\\\n\ Element by element left division operator.\n\ @seealso{\\, ./, rdivide, mrdivide}\n\ @end deftypefn"), pair_type ("\\", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} \\\n\ Left division operator.\n\ @seealso{.\\, /, ldivide, mldivide}\n\ @end deftypefn"), pair_type (":", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} :\n\ Select entire rows or columns of matrices.\n\ @end deftypefn"), pair_type (";", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} ;\n\ Array row or command separator.\n\ @seealso{,}\n\ @end deftypefn"), pair_type ("<", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} <\n\ 'Less than' operator.\n\ @seealso{lt}\n\ @end deftypefn"), pair_type ("<=", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} <=\n\ 'Less than' or 'equals' operator.\n\ @seealso{le}\n\ @end deftypefn"), pair_type ("=", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} =\n\ Assignment operator.\n\ @end deftypefn"), pair_type ("==", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} ==\n\ Equality test operator.\n\ @seealso{eq}\n\ @end deftypefn"), pair_type (">", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} >\n\ 'Greater than' operator.\n\ @seealso{gt}\n\ @end deftypefn"), pair_type (">=", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} >=\n\ 'Greater than' or 'equals' operator.\n\ @seealso{ge}\n\ @end deftypefn"), pair_type ("[", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} [\n\ Return list delimiter.\n\ @seealso{]}\n\ @end deftypefn"), pair_type ("]", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} ]\n\ Return list delimiter.\n\ @seealso{[}\n\ @end deftypefn"), pair_type ("|", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} |\n\ Element by element logical 'or' operator.\n\ @seealso{||, or}\n\ @end deftypefn"), pair_type ("||", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Operator} {} ||\n\ Logical 'or' (with short-circuit evaluation) operator.\n\ @seealso{|, or}\n\ @@ -445,14 +445,14 @@ const static pair_type keywords[] = { pair_type ("break", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} break\n\ Exit the innermost enclosing do, while or for loop.\n\ @seealso{do, while, for, parfor, continue}\n\ @end deftypefn"), pair_type ("case", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} case @var{value}\n\ @deftypefnx {Keyword} {} case @{@var{value}, @dots{}@}\n\ A case statement in a switch. Octave cases are exclusive and do not\n\ @@ -462,7 +462,7 @@ @end deftypefn"), pair_type ("catch", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} catch\n\ @deftypefnx {Keyword} {} catch @var{value}\n\ Begin the cleanup part of a try-catch block.\n\ @@ -470,14 +470,14 @@ @end deftypefn"), pair_type ("continue", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} continue\n\ Jump to the end of the innermost enclosing do, while or for loop.\n\ @seealso{do, while, for, parfor, break}\n\ @end deftypefn"), pair_type ("do", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} do\n\ Begin a do-until loop. This differs from a do-while loop in that the\n\ body of the loop is executed at least once.\n\ @@ -494,21 +494,21 @@ @end deftypefn"), pair_type ("else", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} else\n\ Alternate action for an if block. See @code{if} for an example.\n\ @seealso{if}\n\ @end deftypefn"), pair_type ("elseif", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} elseif (@var{condition})\n\ Alternate conditional test for an if block. See @code{if} for an example.\n\ @seealso{if}\n\ @end deftypefn"), pair_type ("end", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} end\n\ Mark the end of any @code{for}, @code{parfor}, @code{if}, @code{do},\n\ @code{while}, @code{function}, @code{switch}, @code{try}, or\n\ @@ -517,63 +517,63 @@ @end deftypefn"), pair_type ("end_try_catch", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} end_try_catch\n\ Mark the end of an @code{try-catch} block.\n\ @seealso{try, catch}\n\ @end deftypefn"), pair_type ("end_unwind_protect", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} end_unwind_protect\n\ Mark the end of an unwind_protect block.\n\ @seealso{unwind_protect}\n\ @end deftypefn"), pair_type ("endfor", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} endfor\n\ Mark the end of a for loop. See @code{for} for an example.\n\ @seealso{for}\n\ @end deftypefn"), pair_type ("endfunction", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} endfunction\n\ Mark the end of a function.\n\ @seealso{function}\n\ @end deftypefn"), pair_type ("endif", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} endif\n\ Mark the end of an if block. See @code{if} for an example.\n\ @seealso{if}\n\ @end deftypefn"), pair_type ("endparfor", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} endparfor\n\ Mark the end of a parfor loop. See @code{parfor} for an example.\n\ @seealso{parfor}\n\ @end deftypefn"), pair_type ("endswitch", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} endswitch\n\ Mark the end of a switch block. See @code{switch} for an example.\n\ @seealso{switch}\n\ @end deftypefn"), pair_type ("endwhile", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} endwhile\n\ Mark the end of a while loop. See @code{while} for an example.\n\ @seealso{do, while}\n\ @end deftypefn"), pair_type ("for", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} for @var{i} = @var{range}\n\ Begin a for loop.\n\ \n\ @@ -588,7 +588,7 @@ @end deftypefn"), pair_type ("function", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} function @var{outputs} = function (@var{input}, @dots{})\n\ @deftypefnx {Keyword} {} function {} function (@var{input}, @dots{})\n\ @deftypefnx {Keyword} {} function @var{outputs} = function\n\ @@ -598,7 +598,7 @@ @end deftypefn"), pair_type ("global", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} global @var{var}\n\ Declare variables to have global scope.\n\ \n\ @@ -614,7 +614,7 @@ @end deftypefn"), pair_type ("if", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} if (@var{cond}) @dots{} endif\n\ @deftypefnx {Keyword} {} if (@var{cond}) @dots{} else @dots{} endif\n\ @deftypefnx {Keyword} {} if (@var{cond}) @dots{} elseif (@var{cond}) @dots{} endif\n\ @@ -637,14 +637,14 @@ @end deftypefn"), pair_type ("otherwise", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} otherwise\n\ The default statement in a switch block (similar to else in an if block).\n\ @seealso{switch}\n\ @end deftypefn"), pair_type ("parfor", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} parfor @var{i} = @var{range}\n\ @deftypefnx {Keyword} {} parfor (@var{i} = @var{range}, @var{maxproc})\n\ Begin a for loop that may execute in parallel.\n\ @@ -660,7 +660,7 @@ @end deftypefn"), pair_type ("persistent", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} persistent @var{var}\n\ Declare variables as persistent. A variable that has been declared\n\ persistent within a function will retain its contents in memory between\n\ @@ -671,21 +671,21 @@ @end deftypefn"), pair_type ("return", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} return\n\ Return from a function.\n\ @seealso{function}\n\ @end deftypefn"), pair_type ("static", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} static\n\ This statement has been deprecated in favor of @code{persistent}.\n\ @seealso{persistent}\n\ @end deftypefn"), pair_type ("switch", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} switch @var{statement}\n\ Begin a switch block.\n\ \n\ @@ -707,7 +707,7 @@ @end deftypefn"), pair_type ("try", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} try\n\ Begin a try-catch block.\n\ \n\ @@ -719,14 +719,14 @@ @end deftypefn"), pair_type ("until", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} until (@var{cond})\n\ End a do-until loop. See @code{do} for an example.\n\ @seealso{do}\n\ @end deftypefn"), pair_type ("unwind_protect", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} unwind_protect\n\ Begin an unwind_protect block.\n\ \n\ @@ -740,28 +740,28 @@ @end deftypefn"), pair_type ("unwind_protect_cleanup", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} unwind_protect_cleanup\n\ Begin the cleanup section of an unwind_protect block.\n\ @seealso{unwind_protect}\n\ @end deftypefn"), pair_type ("varargin", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} varargin\n\ Pass an arbitrary number of arguments into a function.\n\ @seealso{varargout, nargin, isargout, nargout, nthargout}\n\ @end deftypefn"), pair_type ("varargout", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} varargout\n\ Pass an arbitrary number of arguments out of a function.\n\ @seealso{varargin, nargin, isargout, nargout, nthargout}\n\ @end deftypefn"), pair_type ("while", - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Keyword} {} while\n\ Begin a while loop.\n\ \n\
--- a/libinterp/corefcn/input.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/input.cc Wed Feb 25 11:55:49 2015 -0800 @@ -610,7 +610,7 @@ if (command_editor::interrupt (false)) break; - else + else { if (retval == 0 && curr_parser.stmt_list) {
--- a/libinterp/corefcn/load-path.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/load-path.cc Wed Feb 25 11:55:49 2015 -0800 @@ -79,7 +79,7 @@ const dir_info& di = p->second; if (fs.mtime () + fs.time_resolution () - > di.dir_time_last_checked) + > di.dir_time_last_checked) initialize (); else *this = di; @@ -1279,7 +1279,7 @@ if (! dir_name.empty ()) { std::string pfname = dir_name + file_ops::dir_sep_str () - + "private" + file_ops::dir_sep_str () + fname; + + "private" + file_ops::dir_sep_str () + fname; file_stat fs (pfname);
--- a/libinterp/corefcn/load-path.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/load-path.h Wed Feb 25 11:55:49 2015 -0800 @@ -531,15 +531,15 @@ void remove (const dir_info& di); void clear (void) - { - dir_list.clear (); + { + dir_list.clear (); - fcn_map.clear (); + fcn_map.clear (); - private_fcn_map.clear (); + private_fcn_map.clear (); - method_map.clear (); - } + method_map.clear (); + } void display (std::ostream& out) const;
--- a/libinterp/corefcn/lookup.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/lookup.cc Wed Feb 25 11:55:49 2015 -0800 @@ -52,13 +52,13 @@ struct icmp_char_lt : public std::binary_function<char, char, bool> { bool operator () (char x, char y) const - { return std::toupper (x) < std::toupper (y); } + { return std::toupper (x) < std::toupper (y); } }; struct icmp_char_gt : public std::binary_function<char, char, bool> { bool operator () (char x, char y) const - { return std::toupper (x) > std::toupper (y); } + { return std::toupper (x) > std::toupper (y); } }; // FIXME: maybe these should go elsewhere?
--- a/libinterp/corefcn/lu.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/lu.cc Wed Feb 25 11:55:49 2015 -0800 @@ -218,7 +218,7 @@ SparseLU fact (m, Qinit, thres, false, true); if (nargout < 2) - retval(0) = fact.Y (); + retval(0) = fact.Y (); else { @@ -250,25 +250,25 @@ else { - SparseLU fact (m, thres, scale); + SparseLU fact (m, thres, scale); - if (scale) - retval(4) = fact.R (); + if (scale) + retval(4) = fact.R (); - if (vecout) - { - retval(3) = fact.Pc_vec (); - retval(2) = fact.Pr_vec (); - } - else - { - retval(3) = fact.Pc_mat (); - retval(2) = fact.Pr_mat (); - } - retval(1) = octave_value (fact.U (), - MatrixType (MatrixType::Upper)); - retval(0) = octave_value (fact.L (), - MatrixType (MatrixType::Lower)); + if (vecout) + { + retval(3) = fact.Pc_vec (); + retval(2) = fact.Pr_vec (); + } + else + { + retval(3) = fact.Pc_mat (); + retval(2) = fact.Pr_mat (); + } + retval(1) = octave_value (fact.U (), + MatrixType (MatrixType::Upper)); + retval(0) = octave_value (fact.L (), + MatrixType (MatrixType::Lower)); } } @@ -287,7 +287,7 @@ if (nargout < 2) - retval(0) = fact.Y (); + retval(0) = fact.Y (); else { @@ -301,10 +301,10 @@ PermMatrix P = fact.Pr_mat (); SparseComplexMatrix L = fact.L (); if (nargout < 3) - retval(0) - = octave_value (P.transpose () * L, - MatrixType (MatrixType::Permuted_Lower, - nr, fact.row_perm ())); + retval(0) + = octave_value (P.transpose () * L, + MatrixType (MatrixType::Permuted_Lower, + nr, fact.row_perm ())); else { retval(0) = L; @@ -320,25 +320,25 @@ else { - SparseComplexLU fact (m, thres, scale); + SparseComplexLU fact (m, thres, scale); - if (scale) - retval(4) = fact.R (); + if (scale) + retval(4) = fact.R (); - if (vecout) - { - retval(3) = fact.Pc_vec (); - retval(2) = fact.Pr_vec (); - } - else - { - retval(3) = fact.Pc_mat (); - retval(2) = fact.Pr_mat (); - } - retval(1) = octave_value (fact.U (), - MatrixType (MatrixType::Upper)); - retval(0) = octave_value (fact.L (), - MatrixType (MatrixType::Lower)); + if (vecout) + { + retval(3) = fact.Pc_vec (); + retval(2) = fact.Pr_vec (); + } + else + { + retval(3) = fact.Pc_mat (); + retval(2) = fact.Pr_mat (); + } + retval(1) = octave_value (fact.U (), + MatrixType (MatrixType::Upper)); + retval(0) = octave_value (fact.L (), + MatrixType (MatrixType::Lower)); } }
--- a/libinterp/corefcn/oct-stream.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/oct-stream.cc Wed Feb 25 11:55:49 2015 -0800 @@ -2515,7 +2515,7 @@ std::string::size_type i1, i2; tfmt.replace ((i1 = tfmt.rfind (elt->type)), - 1, 1, 's'); + 1, 1, 's'); if ((i2 = tfmt.rfind ('.')) != std::string::npos && i2 < i1)
--- a/libinterp/corefcn/octave-default-image.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/octave-default-image.h Wed Feb 25 11:55:49 2015 -0800 @@ -20,7 +20,8 @@ */ -static char default_im_data[] = { +static char default_im_data[] = +{ 31,31,31,31,31,31,31,31,31,31,31,31,31,31,31,31, 31,31,31,31,31,31,20,20,20,20,20,20,21,21,21,21, 31,31,31,31,31,31,31,31,31,31,31,31,31,31,31,31,
--- a/libinterp/corefcn/ordschur.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/ordschur.cc Wed Feb 25 11:55:49 2015 -0800 @@ -162,7 +162,7 @@ return retval; \ } \ retval(0) = U; \ - retval(1) = S; \ + retval(1) = S; if (double_type) {
--- a/libinterp/corefcn/pr-output.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/pr-output.cc Wed Feb 25 11:55:49 2015 -0800 @@ -822,7 +822,7 @@ int x_min = min_abs == 0.0 ? 0 : num_digits (min_abs); scale = (x_max == 0 || int_or_inf_or_nan) - ? 1.0 : std::pow (10.0, calc_scale_exp (x_max - 1)); + ? 1.0 : std::pow (10.0, calc_scale_exp (x_max - 1)); set_real_matrix_format (x_max, x_min, inf_or_nan, int_or_inf_or_nan, fw); } @@ -1238,7 +1238,7 @@ int x_min = r_x_min > i_x_min ? r_x_min : i_x_min; scale = (x_max == 0 || int_or_inf_or_nan) - ? 1.0 : std::pow (10.0, calc_scale_exp (x_max - 1)); + ? 1.0 : std::pow (10.0, calc_scale_exp (x_max - 1)); set_complex_matrix_format (x_max, x_min, r_x_max, r_x_min, inf_or_nan, int_or_inf_or_nan, r_fw, i_fw); @@ -1394,7 +1394,7 @@ int x_min = min_abs == 0.0 ? 0 : num_digits (min_abs); scale = (x_max == 0 || all_ints) - ? 1.0 : std::pow (10.0, calc_scale_exp (x_max - 1)); + ? 1.0 : std::pow (10.0, calc_scale_exp (x_max - 1)); set_range_format (x_max, x_min, all_ints, fw); } @@ -2586,7 +2586,7 @@ default: print_nd_array <ComplexNDArray, Complex, ComplexMatrix> - (os, nda, pr_as_read_syntax); + (os, nda, pr_as_read_syntax); break; } }
--- a/libinterp/corefcn/qz.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/qz.cc Wed Feb 25 11:55:49 2015 -0800 @@ -75,7 +75,7 @@ octave_idx_type& INFO F77_CHAR_ARG_LEN_DECL); -F77_RET_T + F77_RET_T F77_FUNC (zggbal, ZGGBAL) (F77_CONST_CHAR_ARG_DECL, const octave_idx_type& N, Complex* A, const octave_idx_type& LDA, Complex* B, @@ -97,7 +97,7 @@ F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); -F77_RET_T + F77_RET_T F77_FUNC (zggbak, ZGGBAK) (F77_CONST_CHAR_ARG_DECL, F77_CONST_CHAR_ARG_DECL, const octave_idx_type& N, @@ -122,7 +122,7 @@ F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); - F77_RET_T + F77_RET_T F77_FUNC (zgghrd, ZGGHRD) (F77_CONST_CHAR_ARG_DECL, F77_CONST_CHAR_ARG_DECL, const octave_idx_type& N, @@ -153,7 +153,7 @@ F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); -F77_RET_T + F77_RET_T F77_FUNC (zhgeqz, ZHGEQZ) (F77_CONST_CHAR_ARG_DECL, F77_CONST_CHAR_ARG_DECL, F77_CONST_CHAR_ARG_DECL, @@ -204,7 +204,7 @@ F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); -F77_RET_T + F77_RET_T F77_FUNC (ztgevc, ZTGEVC) (F77_CONST_CHAR_ARG_DECL, F77_CONST_CHAR_ARG_DECL, octave_idx_type* SELECT,
--- a/libinterp/corefcn/strfns.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/strfns.cc Wed Feb 25 11:55:49 2015 -0800 @@ -737,7 +737,7 @@ struct icmp_char_eq : public std::binary_function<char, char, bool> { bool operator () (char x, char y) const - { return std::toupper (x) == std::toupper (y); } + { return std::toupper (x) == std::toupper (y); } }; // strcmpi is equivalent to strcmp in that it checks all dims.
--- a/libinterp/corefcn/symtab.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/symtab.cc Wed Feb 25 11:55:49 2015 -0800 @@ -247,7 +247,7 @@ if (octave_env::absolute_pathname (nm) && ((nm_len > 4 && (nm.substr (nm_len-4) == ".oct" || nm.substr (nm_len-4) == ".mex")) - || (nm_len > 2 && nm.substr (nm_len-2) == ".m"))) + || (nm_len > 2 && nm.substr (nm_len-2) == ".m"))) file = nm; else {
--- a/libinterp/corefcn/symtab.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/symtab.h Wed Feb 25 11:55:49 2015 -0800 @@ -1056,7 +1056,7 @@ } octave_value find_function (const octave_value_list& args - = octave_value_list (), + = octave_value_list (), bool local_funcs = true) { return rep->find_function (args, local_funcs);
--- a/libinterp/corefcn/sysdep.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/sysdep.cc Wed Feb 25 11:55:49 2015 -0800 @@ -186,7 +186,7 @@ #endif DEFUN (__open_with_system_app__, args, , - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __open_with_system_app__ (@var{file})\n\ Undocumented internal function.\n\ @end deftypefn") @@ -1017,7 +1017,7 @@ // needed for X11 and Carbon functions. DEFUN (have_window_system, , , - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} have_window_system ()\n\ Return true if a window system is available (X11, Windows, or Apple OS X)\n\ and false otherwise.\n\
--- a/libinterp/corefcn/variables.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/variables.cc Wed Feb 25 11:55:49 2015 -0800 @@ -460,18 +460,18 @@ if (fs) { if (search_any || search_file) - { - if (fs.is_dir ()) - return 7; - - len = file_name.length (); - - if (len > 4 && (file_name.substr (len-4) == ".oct" - || file_name.substr (len-4) == ".mex")) - return 3; - else - return 2; - } + { + if (fs.is_dir ()) + return 7; + + len = file_name.length (); + + if (len > 4 && (file_name.substr (len-4) == ".oct" + || file_name.substr (len-4) == ".mex")) + return 3; + else + return 2; + } else if (search_dir && fs.is_dir ()) return 7; }
--- a/libinterp/corefcn/zfstream.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/zfstream.h Wed Feb 25 11:55:49 2015 -0800 @@ -178,7 +178,7 @@ virtual pos_type seekoff (off_type off, std::ios_base::seekdir way, std::ios_base::openmode mode = - std::ios_base::in|std::ios_base::out); + std::ios_base::in|std::ios_base::out); /** * @brief Alters the stream positions. @@ -187,7 +187,7 @@ */ virtual pos_type seekpos (pos_type sp, std::ios_base::openmode mode = - std::ios_base::in|std::ios_base::out); + std::ios_base::in|std::ios_base::out); virtual int_type pbackfail (int_type c = traits_type::eof ());
--- a/libinterp/dldfcn/__fltk_uigetfile__.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/dldfcn/__fltk_uigetfile__.cc Wed Feb 25 11:55:49 2015 -0800 @@ -126,7 +126,8 @@ retval(0) = file_ops::native_separator_path (std::string (fc.value ())); else { - retval(1) = file_ops::native_separator_path (std::string (fc.directory ()) + sep); + retval(1) = file_ops::native_separator_path ( + std::string (fc.directory ()) + sep); retval(2) = fc.filter_value () + 1; } }
--- a/libinterp/dldfcn/__init_fltk__.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/dldfcn/__init_fltk__.cc Wed Feb 25 11:55:49 2015 -0800 @@ -651,7 +651,8 @@ { friend class fltk_uimenu; public: - plot_window (int xx, int yy, int ww, int hh, figure::properties& xfp, bool internal) + plot_window (int xx, int yy, int ww, int hh, figure::properties& xfp, + bool internal) : Fl_Window (xx, yy, ww, hh + menu_h + status_h + 2, "octave"), window_label (), fp (xfp), canvas (0), autoscale (0), togglegrid (0), panzoom (0), rotate (0), help (0), @@ -889,20 +890,20 @@ } Matrix outerposition2position (const Matrix& outerpos) - { - Matrix pos = outerpos; - pos(1) += menu_dy (); - pos(3) -= menu_dy () + status_h + 2; - return pos; - } + { + Matrix pos = outerpos; + pos(1) += menu_dy (); + pos(3) -= menu_dy () + status_h + 2; + return pos; + } Matrix position2outerposition (const Matrix& pos) - { - Matrix outerpos = pos; - outerpos(1) -= menu_dy (); - outerpos(3) += menu_dy () + status_h + 2; - return outerpos; - } + { + Matrix outerpos = pos; + outerpos(1) -= menu_dy (); + outerpos(3) += menu_dy () + status_h + 2; + return outerpos; + } // Called from figure::properties::ID_POSITION if internal = true // or ID_OUTERPOSITION if false. @@ -1437,236 +1438,237 @@ break; } - // Events we only handle if they are in the canvas area. - if (Fl::event_inside (canvas)) - switch (event) - { - case FL_MOVE: - pixel2status (pixel2axes_or_ca (Fl::event_x (), - Fl::event_y () - menu_dy ()), - Fl::event_x (), Fl::event_y () - menu_dy ()); - return 1; + // Events we only handle if they are in the canvas area. + if (Fl::event_inside (canvas)) + switch (event) + { + case FL_MOVE: + pixel2status (pixel2axes_or_ca (Fl::event_x (), + Fl::event_y () - menu_dy ()), + Fl::event_x (), Fl::event_y () - menu_dy ()); + return 1; - case FL_PUSH: - pos_x = Fl::event_x (); - pos_y = Fl::event_y () - menu_dy (); - - set_currentpoint (pos_x, pos_y); + case FL_PUSH: + pos_x = Fl::event_x (); + pos_y = Fl::event_y () - menu_dy (); - if (Fl::event_button () == FL_LEFT_MOUSE - && Fl::event_shift ()) - fp.set_selectiontype ("extend"); - else if ((Fl::event_button () == FL_LEFT_MOUSE - && Fl::event_ctrl ()) - || Fl::event_button () == FL_RIGHT_MOUSE) - fp.set_selectiontype ("alternate"); - else if (Fl::event_clicks ()) - fp.set_selectiontype ("open"); - else - fp.set_selectiontype ("normal"); + set_currentpoint (pos_x, pos_y); - if (fp.get_windowbuttondownfcn ().is_defined ()) - fp.execute_windowbuttondownfcn (Fl::event_button ()); + if (Fl::event_button () == FL_LEFT_MOUSE + && Fl::event_shift ()) + fp.set_selectiontype ("extend"); + else if ((Fl::event_button () == FL_LEFT_MOUSE + && Fl::event_ctrl ()) + || Fl::event_button () == FL_RIGHT_MOUSE) + fp.set_selectiontype ("alternate"); + else if (Fl::event_clicks ()) + fp.set_selectiontype ("open"); + else + fp.set_selectiontype ("normal"); - gh = pixel2axes_or_ca (pos_x, pos_y); + if (fp.get_windowbuttondownfcn ().is_defined ()) + fp.execute_windowbuttondownfcn (Fl::event_button ()); - if (gh.ok ()) - { - ax_obj = gh_manager::get_object (gh); - set_axes_currentpoint (ax_obj, pos_x, pos_y); + gh = pixel2axes_or_ca (pos_x, pos_y); - int ndim = calc_dimensions (ax_obj); + if (gh.ok ()) + { + ax_obj = gh_manager::get_object (gh); + set_axes_currentpoint (ax_obj, pos_x, pos_y); - if (ndim == 3) - rotate->activate (); - else // ndim == 2 - rotate->deactivate (); + int ndim = calc_dimensions (ax_obj); - fp.set_currentobject (ax_obj.get_handle ().value ()); + if (ndim == 3) + rotate->activate (); + else // ndim == 2 + rotate->deactivate (); - base_properties& props = ax_obj.get_properties (); - if (props.get_buttondownfcn ().is_defined ()) - props.execute_buttondownfcn (Fl::event_button ()); + fp.set_currentobject (ax_obj.get_handle ().value ()); - return 1; - } - else if (fp.get_buttondownfcn ().is_defined ()) - fp.execute_buttondownfcn (Fl::event_button ()); + base_properties& props = ax_obj.get_properties (); + if (props.get_buttondownfcn ().is_defined ()) + props.execute_buttondownfcn (Fl::event_button ()); - break; + return 1; + } + else if (fp.get_buttondownfcn ().is_defined ()) + fp.execute_buttondownfcn (Fl::event_button ()); - case FL_DRAG: - if (fp.get_windowbuttonmotionfcn ().is_defined ()) - { - set_currentpoint (Fl::event_x (), Fl::event_y () - menu_dy ()); - fp.execute_windowbuttonmotionfcn (); - } + break; - if (Fl::event_button () == 1) - { - if (ax_obj && ax_obj.isa ("axes")) - { - axes::properties& ap = - dynamic_cast<axes::properties&> - (ax_obj.get_properties ()); + case FL_DRAG: + if (fp.get_windowbuttonmotionfcn ().is_defined ()) + { + set_currentpoint (Fl::event_x (), Fl::event_y () - menu_dy ()); + fp.execute_windowbuttonmotionfcn (); + } - // Don't pan or rotate legend - if (ap.get_tag ().compare ("legend") < 0) - { - if (rotate_enabled ()) - view2status (ax_obj); - else - pixel2status (ax_obj, pos_x, pos_y, - Fl::event_x (), - Fl::event_y () - menu_dy ()); - - double x0, y0, x1, y1; - Matrix pos = fp.get_boundingbox (true); - pixel2pos (ax_obj, pos_x, pos_y, x0, y0); - pixel2pos (ax_obj, Fl::event_x (), - Fl::event_y () - menu_dy (), - x1, y1); + if (Fl::event_button () == 1) + { + if (ax_obj && ax_obj.isa ("axes")) + { + axes::properties& ap = + dynamic_cast<axes::properties&> + (ax_obj.get_properties ()); - if (pan_enabled ()) - ap.translate_view ("both", x0, x1, y0, y1); - else if (rotate_enabled ()) - { - double daz, del; - daz = (Fl::event_x () - pos_x) / pos(2) * 360; - del = (Fl::event_y () - menu_dy () - pos_y) - / pos(3) * 360; - ap.rotate_view (del, daz); - } - } - else - { // move the position of the legend - Matrix pos = ap.get_position ().matrix_value (); - pos(0) += double (Fl::event_x () - pos_x) - / canvas->w (); - pos(1) -= double (Fl::event_y () - menu_dy () - pos_y) - / canvas->h (); - ap.set_position (pos); - } + // Don't pan or rotate legend + if (ap.get_tag ().compare ("legend") < 0) + { + if (rotate_enabled ()) + view2status (ax_obj); + else + pixel2status (ax_obj, pos_x, pos_y, + Fl::event_x (), + Fl::event_y () - menu_dy ()); + + double x0, y0, x1, y1; + Matrix pos = fp.get_boundingbox (true); + pixel2pos (ax_obj, pos_x, pos_y, x0, y0); + pixel2pos (ax_obj, Fl::event_x (), + Fl::event_y () - menu_dy (), + x1, y1); - pos_x = Fl::event_x (); - pos_y = Fl::event_y () - menu_dy (); - mark_modified (); - } - return 1; - } - else if (Fl::event_button () == 3) - { - pixel2status (ax_obj, pos_x, pos_y, - Fl::event_x (), Fl::event_y () - menu_dy ()); - Matrix zoom_box (1,4,0); - zoom_box (0) = pos_x; - zoom_box (1) = pos_y; - zoom_box (2) = Fl::event_x (); - zoom_box (3) = Fl::event_y () - menu_dy (); - canvas->set_zoom_box (zoom_box); - canvas->zoom (true); - mark_modified (); - return 1; - } - - break; + if (pan_enabled ()) + ap.translate_view ("both", x0, x1, y0, y1); + else if (rotate_enabled ()) + { + double daz, del; + daz = (Fl::event_x () - pos_x) / pos(2) * 360; + del = (Fl::event_y () - menu_dy () - pos_y) + / pos(3) * 360; + ap.rotate_view (del, daz); + } + } + else + { + // move the position of the legend + Matrix pos = ap.get_position ().matrix_value (); + pos(0) += double (Fl::event_x () - pos_x) + / canvas->w (); + pos(1) -= double (Fl::event_y () - menu_dy () - pos_y) + / canvas->h (); + ap.set_position (pos); + } - case FL_MOUSEWHEEL: - { - graphics_object ax = - gh_manager::get_object (pixel2axes_or_ca (Fl::event_x (), - Fl::event_y () - - menu_dy ())); - if (ax && ax.isa ("axes")) + pos_x = Fl::event_x (); + pos_y = Fl::event_y () - menu_dy (); + mark_modified (); + } + return 1; + } + else if (Fl::event_button () == 3) { - axes::properties& ap = - dynamic_cast<axes::properties&> (ax.get_properties ()); - - // Control how fast to zoom when using scroll wheel. - double wheel_zoom_speed = ap.get_mousewheelzoom (); - - // Determine if we're zooming in or out. - const double factor = - (Fl::event_dy () > 0) ? 1 / (1.0 - wheel_zoom_speed) - : 1.0 - wheel_zoom_speed; - - // Get the point we're zooming about. - double x1, y1; - pixel2pos (ax, Fl::event_x (), Fl::event_y () - menu_dy (), - x1, y1); - - ap.zoom_about_point ("both", x1, y1, factor, false); + pixel2status (ax_obj, pos_x, pos_y, + Fl::event_x (), Fl::event_y () - menu_dy ()); + Matrix zoom_box (1,4,0); + zoom_box (0) = pos_x; + zoom_box (1) = pos_y; + zoom_box (2) = Fl::event_x (); + zoom_box (3) = Fl::event_y () - menu_dy (); + canvas->set_zoom_box (zoom_box); + canvas->zoom (true); mark_modified (); return 1; } - } + + break; + + case FL_MOUSEWHEEL: + { + graphics_object ax = + gh_manager::get_object (pixel2axes_or_ca (Fl::event_x (), + Fl::event_y () + - menu_dy ())); + if (ax && ax.isa ("axes")) + { + axes::properties& ap = + dynamic_cast<axes::properties&> (ax.get_properties ()); - case FL_RELEASE: - if (fp.get_windowbuttonupfcn ().is_defined ()) - { - set_currentpoint (Fl::event_x (), Fl::event_y () - menu_dy ()); - fp.execute_windowbuttonupfcn (); + // Control how fast to zoom when using scroll wheel. + double wheel_zoom_speed = ap.get_mousewheelzoom (); + + // Determine if we're zooming in or out. + const double factor = + (Fl::event_dy () > 0) ? 1 / (1.0 - wheel_zoom_speed) + : 1.0 - wheel_zoom_speed; + + // Get the point we're zooming about. + double x1, y1; + pixel2pos (ax, Fl::event_x (), Fl::event_y () - menu_dy (), + x1, y1); + + ap.zoom_about_point ("both", x1, y1, factor, false); + mark_modified (); + return 1; + } } - if ((Fl::event_button () == 1) && Fl::event_clicks ()) - { - // Double click - set_on_ax_obj ("xlimmode", "auto"); - set_on_ax_obj ("ylimmode", "auto"); - set_on_ax_obj ("zlimmode", "auto"); - return 1; - } - if (Fl::event_button () == 3) - { - // End of drag -- zoom. - if (canvas->zoom ()) - { - canvas->zoom (false); - double x0,y0,x1,y1; - if (ax_obj && ax_obj.isa ("axes")) - { - axes::properties& ap = dynamic_cast<axes::properties&> - (ax_obj.get_properties ()); - pixel2pos (ax_obj, pos_x, pos_y, x0, y0); - int pos_x1 = Fl::event_x (); - int pos_y1 = Fl::event_y () - menu_dy (); - pixel2pos (ax_obj, pos_x1, pos_y1, x1, y1); - Matrix xl (1,2,0); - Matrix yl (1,2,0); - int dx = abs (pos_x - pos_x1); - int dy = abs (pos_y - pos_y1); - // Smallest zoom box must be 4 pixels square - if ((dx > 4) && (dy > 4)) - { - if (x0 < x1) - { - xl(0) = x0; - xl(1) = x1; - } - else - { - xl(0) = x1; - xl(1) = x0; - } - if (y0 < y1) - { - yl(0) = y0; - yl(1) = y1; - } - else - { - yl(0) = y1; - yl(1) = y0; - } - ap.zoom ("both", xl, yl); - } - mark_modified (); - return 1; - } - } - } - break; - } + case FL_RELEASE: + if (fp.get_windowbuttonupfcn ().is_defined ()) + { + set_currentpoint (Fl::event_x (), Fl::event_y () - menu_dy ()); + fp.execute_windowbuttonupfcn (); + } + + if ((Fl::event_button () == 1) && Fl::event_clicks ()) + { + // Double click + set_on_ax_obj ("xlimmode", "auto"); + set_on_ax_obj ("ylimmode", "auto"); + set_on_ax_obj ("zlimmode", "auto"); + return 1; + } + if (Fl::event_button () == 3) + { + // End of drag -- zoom. + if (canvas->zoom ()) + { + canvas->zoom (false); + double x0,y0,x1,y1; + if (ax_obj && ax_obj.isa ("axes")) + { + axes::properties& ap = dynamic_cast<axes::properties&> + (ax_obj.get_properties ()); + pixel2pos (ax_obj, pos_x, pos_y, x0, y0); + int pos_x1 = Fl::event_x (); + int pos_y1 = Fl::event_y () - menu_dy (); + pixel2pos (ax_obj, pos_x1, pos_y1, x1, y1); + Matrix xl (1,2,0); + Matrix yl (1,2,0); + int dx = abs (pos_x - pos_x1); + int dy = abs (pos_y - pos_y1); + // Smallest zoom box must be 4 pixels square + if ((dx > 4) && (dy > 4)) + { + if (x0 < x1) + { + xl(0) = x0; + xl(1) = x1; + } + else + { + xl(0) = x1; + xl(1) = x0; + } + if (y0 < y1) + { + yl(0) = y0; + yl(1) = y1; + } + else + { + yl(0) = y1; + yl(1) = y0; + } + ap.zoom ("both", xl, yl); + } + mark_modified (); + return 1; + } + } + } + break; + } } //std::cout << "plot_window::handle wasn't interested in event " << fl_eventnames[event] << std::endl; return Fl_Window::handle (event); @@ -1857,7 +1859,8 @@ idx2figprops (curr_index, fp); - windows[curr_index++] = new plot_window (pos(0), pos(1), pos(2), pos(3), fp, internal); + windows[curr_index++] = new plot_window (pos(0), pos(1), pos(2), pos(3), + fp, internal); } }
--- a/libinterp/dldfcn/__magick_read__.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/dldfcn/__magick_read__.cc Wed Feb 25 11:55:49 2015 -0800 @@ -1492,8 +1492,10 @@ const octave_idx_type nFrames = imvec.size (); const octave_idx_type quality = options.getfield ("quality").int_value (); - const ColumnVector delaytime = options.getfield ("delaytime").column_vector_value (); - const Array<std::string> disposalmethod = options.getfield ("disposalmethod").cellstr_value (); + const ColumnVector delaytime = + options.getfield ("delaytime").column_vector_value (); + const Array<std::string> disposalmethod = + options.getfield ("disposalmethod").cellstr_value (); for (octave_idx_type i = 0; i < nFrames; i++) { imvec[i].quality (quality);
--- a/libinterp/dldfcn/__osmesa_print__.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/dldfcn/__osmesa_print__.cc Wed Feb 25 11:55:49 2015 -0800 @@ -110,8 +110,8 @@ } #ifndef HAVE_GL2PS_H - error ("__osmesa_print__: Octave has been compiled without gl2ps"); - return retval; + error ("__osmesa_print__: Octave has been compiled without gl2ps"); + return retval; #endif }
--- a/libinterp/dldfcn/audiodevinfo.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/dldfcn/audiodevinfo.cc Wed Feb 25 11:55:49 2015 -0800 @@ -2547,11 +2547,11 @@ audiorecorder *recorder = get_recorder (args(0)); - if (! recorder) - { - print_usage (); - return retval; - } + if (! recorder) + { + print_usage (); + return retval; + } recorder->stop ();
--- a/libinterp/octave-value/ov-classdef.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/octave-value/ov-classdef.cc Wed Feb 25 11:55:49 2015 -0800 @@ -571,12 +571,12 @@ if (meth.ok ()) { - if (meth.is_static ()) - retval = meth.execute (args.splice (0, 2), nargout, - true, "fevalStatic"); - else - error ("fevalStatic: method `%s' is not static", - meth_name.c_str ()); + if (meth.is_static ()) + retval = meth.execute (args.splice (0, 2), nargout, + true, "fevalStatic"); + else + error ("fevalStatic: method `%s' is not static", + meth_name.c_str ()); } else error ("fevalStatic: method not found: %s", @@ -642,8 +642,10 @@ octave_value_list retval; \ \ if (args.length () == 2 \ - && args(0).type_name () == "object" && args(1).type_name () == "object" \ - && args(0).class_name () == "meta.class" && args(1).class_name () == "meta.class") \ + && args(0).type_name () == "object" \ + && args(1).type_name () == "object" \ + && args(0).class_name () == "meta.class" \ + && args(1).class_name () == "meta.class") \ { \ cdef_class clsa = to_cdef (args(0)); \ \ @@ -733,7 +735,8 @@ for (std::list<cdef_class>::const_iterator it = super_list.begin (); it != super_list.end (); ++it) { - all_handle_compatible = all_handle_compatible && it->get ("HandleCompatible").bool_value (); + all_handle_compatible = all_handle_compatible + && it->get ("HandleCompatible").bool_value (); has_handle_class = has_handle_class || it->is_handle_class (); } @@ -884,7 +887,8 @@ octave_classdef::register_type (void) { t_id = octave_value_typeinfo::register_type - (octave_classdef::t_name, "<unknown>", octave_value (new octave_classdef ())); + (octave_classdef::t_name, "<unknown>", + octave_value (new octave_classdef ())); } octave_value_list @@ -1107,7 +1111,7 @@ : object (obj) { } ~octave_classdef_meta (void) - { object.meta_release (); } + { object.meta_release (); } octave_function* function_value (bool = false) { return this; } @@ -1115,53 +1119,53 @@ subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout) - { return object.meta_subsref (type, idx, nargout); } + { return object.meta_subsref (type, idx, nargout); } octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx) - { - octave_value_list retval; - - retval = subsref (type, idx, 1); - - return (retval.length () > 0 ? retval(0) : octave_value ()); - } + { + octave_value_list retval; + + retval = subsref (type, idx, 1); + + return (retval.length () > 0 ? retval(0) : octave_value ()); + } octave_value_list do_multi_index_op (int nargout, const octave_value_list& idx) - { - // Emulate ()-type meta subsref - - std::list<octave_value_list> l (1, idx); - std::string type ("("); - - return subsref (type, l, nargout); - } + { + // Emulate ()-type meta subsref + + std::list<octave_value_list> l (1, idx); + std::string type ("("); + + return subsref (type, l, nargout); + } bool is_postfix_index_handled (char type) const - { return object.meta_is_postfix_index_handled (type); } + { return object.meta_is_postfix_index_handled (type); } bool is_classdef_constructor (const std::string& cname = std::string ()) const - { - bool retval = false; - - if (object.is_class ()) - { - if (cname.empty ()) - retval = true; - else - { - cdef_class cls (object); - - if (cls.get_name () == cname) - retval = true; - } - } - - return retval; - } + { + bool retval = false; + + if (object.is_class ()) + { + if (cname.empty ()) + retval = true; + else + { + cdef_class cls (object); + + if (cls.get_name () == cname) + retval = true; + } + } + + return retval; + } private: cdef_meta_object object; @@ -1183,145 +1187,145 @@ subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout) - { - size_t skip = 0; - octave_value_list retval; - - switch (type[0]) - { - case '(': - skip = 1; - retval = do_multi_index_op (type.length () > 1 ? 1 : nargout, - idx.front ()); - break; - default: - retval = do_multi_index_op (1, octave_value_list ()); - break; - } - - if (! error_state) - { - if (type.length () > skip && idx.size () > skip - && retval.length () > 0) - retval = retval(0).next_subsref (nargout, type, idx, skip); - } - - return retval; - } + { + size_t skip = 0; + octave_value_list retval; + + switch (type[0]) + { + case '(': + skip = 1; + retval = do_multi_index_op (type.length () > 1 ? 1 : nargout, + idx.front ()); + break; + default: + retval = do_multi_index_op (1, octave_value_list ()); + break; + } + + if (! error_state) + { + if (type.length () > skip && idx.size () > skip + && retval.length () > 0) + retval = retval(0).next_subsref (nargout, type, idx, skip); + } + + return retval; + } octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx) - { - octave_value_list retval; - - retval = subsref (type, idx, 1); - - return (retval.length () > 0 ? retval(0) : octave_value ()); - } + { + octave_value_list retval; + + retval = subsref (type, idx, 1); + + return (retval.length () > 0 ? retval(0) : octave_value ()); + } octave_value_list do_multi_index_op (int nargout, const octave_value_list& idx) - { - octave_value_list retval; - - std::string meth_name; - bool in_constructor; - cdef_class ctx; - - ctx = get_class_context (meth_name, in_constructor); - - if (! error_state && ctx.ok ()) - { - std::string mname = args(0).string_value (); - std::string cname = args(1).string_value (); - - cdef_class cls = lookup_class (cname); - - if (! error_state) - { - if (in_constructor) - { - if (is_direct_superclass (cls, ctx)) - { - if (is_constructed_object (mname)) - { - octave_value sym = symbol_table::varval (mname); - - cls.run_constructor (to_cdef_ref (sym), idx); - - retval(0) = sym; - } - else - ::error ("cannot call superclass constructor with " - "variable `%s'", mname.c_str ()); - } - else - ::error ("`%s' is not a direct superclass of `%s'", - cname.c_str (), ctx.get_name ().c_str ()); - } - else - { - if (mname == meth_name) - { - if (is_strict_superclass (cls, ctx)) - { - // I see 2 possible implementations here: - // 1) use cdef_object::subsref with a different class - // context; this avoids duplicating code, but - // assumes the object is always the first argument - // 2) lookup the method manually and call - // cdef_method::execute; this duplicates part of - // logic in cdef_object::subsref, but avoid the - // assumption of 1) - // Not being sure about the assumption of 1), I - // go with option 2) for the time being. - - cdef_method meth = cls.find_method (meth_name, false); - - if (meth.ok ()) - retval = meth.execute (idx, nargout, true, - meth_name); - else - ::error ("no method `%s' found in superclass `%s'", - meth_name.c_str (), cname.c_str ()); - } - else - ::error ("`%s' is not a superclass of `%s'", - cname.c_str (), ctx.get_name ().c_str ()); - } - else - ::error ("method name mismatch (`%s' != `%s')", - mname.c_str (), meth_name.c_str ()); - } - } - } - else if (! error_state) - ::error ("superclass calls can only occur in methods or constructors"); - - return retval; - } + { + octave_value_list retval; + + std::string meth_name; + bool in_constructor; + cdef_class ctx; + + ctx = get_class_context (meth_name, in_constructor); + + if (! error_state && ctx.ok ()) + { + std::string mname = args(0).string_value (); + std::string cname = args(1).string_value (); + + cdef_class cls = lookup_class (cname); + + if (! error_state) + { + if (in_constructor) + { + if (is_direct_superclass (cls, ctx)) + { + if (is_constructed_object (mname)) + { + octave_value sym = symbol_table::varval (mname); + + cls.run_constructor (to_cdef_ref (sym), idx); + + retval(0) = sym; + } + else + ::error ("cannot call superclass constructor with " + "variable `%s'", mname.c_str ()); + } + else + ::error ("`%s' is not a direct superclass of `%s'", + cname.c_str (), ctx.get_name ().c_str ()); + } + else + { + if (mname == meth_name) + { + if (is_strict_superclass (cls, ctx)) + { + // I see 2 possible implementations here: + // 1) use cdef_object::subsref with a different class + // context; this avoids duplicating code, but + // assumes the object is always the first argument + // 2) lookup the method manually and call + // cdef_method::execute; this duplicates part of + // logic in cdef_object::subsref, but avoid the + // assumption of 1) + // Not being sure about the assumption of 1), I + // go with option 2) for the time being. + + cdef_method meth = cls.find_method (meth_name, false); + + if (meth.ok ()) + retval = meth.execute (idx, nargout, true, + meth_name); + else + ::error ("no method `%s' found in superclass `%s'", + meth_name.c_str (), cname.c_str ()); + } + else + ::error ("`%s' is not a superclass of `%s'", + cname.c_str (), ctx.get_name ().c_str ()); + } + else + ::error ("method name mismatch (`%s' != `%s')", + mname.c_str (), meth_name.c_str ()); + } + } + } + else if (! error_state) + ::error ("superclass calls can only occur in methods or constructors"); + + return retval; + } private: bool is_constructed_object (const std::string nm) - { - octave_function *of = octave_call_stack::current (); - - if (of->is_classdef_constructor ()) - { - octave_user_function *uf = of->user_function_value (true); - - if (uf) - { - tree_parameter_list *ret_list = uf->return_list (); - - if (ret_list && ret_list->length () == 1) - return (ret_list->front ()->name () == nm); - } - } - - return false; - } + { + octave_function *of = octave_call_stack::current (); + + if (of->is_classdef_constructor ()) + { + octave_user_function *uf = of->user_function_value (true); + + if (uf) + { + tree_parameter_list *ret_list = uf->return_list (); + + if (ret_list && ret_list->length () == 1) + return (ret_list->front ()->name () == nm); + } + } + + return false; + } private: octave_value_list args; @@ -1372,7 +1376,8 @@ } else { - Cell cvalue (dim_vector (1, 1), it->second.get_value (*this, false)); + Cell cvalue (dim_vector (1, 1), + it->second.get_value (*this, false)); if (! error_state) retval.setfield (it->first, cvalue); @@ -1415,75 +1420,75 @@ switch (type[0]) { case '.': - { - std::string name = (idx.front ())(0).string_value (); - - cdef_method meth = cls.find_method (name); - - if (meth.ok ()) - { - int _nargout = (type.length () > 2 ? 1 : nargout); - - octave_value_list args; - - skip = 1; - - if (type.length () > 1 && type[1] == '(') - { - std::list<octave_value_list>::const_iterator it = idx.begin (); - - args = *++it; - - skip++; - } - - if (meth.is_static ()) - retval = meth.execute (args, _nargout, true, "subsref"); - else - { - refcount++; - retval = meth.execute (cdef_object (this), args, _nargout, - true, "subsref"); - } - } - - if (skip == 0 && ! error_state) - { - cdef_property prop = cls.find_property (name); - - if (prop.ok ()) - { - if (prop.is_constant ()) - retval(0) = prop.get_value (true, "subsref"); - else - { - refcount++; - retval(0) = prop.get_value (cdef_object (this), - true, "subsref"); - } - - skip = 1; - } - else - error ("subsref: unknown method or property: %s", name.c_str ()); - } - break; - } + { + std::string name = (idx.front ())(0).string_value (); + + cdef_method meth = cls.find_method (name); + + if (meth.ok ()) + { + int _nargout = (type.length () > 2 ? 1 : nargout); + + octave_value_list args; + + skip = 1; + + if (type.length () > 1 && type[1] == '(') + { + std::list<octave_value_list>::const_iterator it = idx.begin (); + + args = *++it; + + skip++; + } + + if (meth.is_static ()) + retval = meth.execute (args, _nargout, true, "subsref"); + else + { + refcount++; + retval = meth.execute (cdef_object (this), args, _nargout, + true, "subsref"); + } + } + + if (skip == 0 && ! error_state) + { + cdef_property prop = cls.find_property (name); + + if (prop.ok ()) + { + if (prop.is_constant ()) + retval(0) = prop.get_value (true, "subsref"); + else + { + refcount++; + retval(0) = prop.get_value (cdef_object (this), + true, "subsref"); + } + + skip = 1; + } + else + error ("subsref: unknown method or property: %s", name.c_str ()); + } + break; + } case '(': - { - refcount++; - - cdef_object this_obj (this); - - Array<cdef_object> arr (dim_vector (1, 1), this_obj); - - cdef_object new_obj = cdef_object (new cdef_object_array (arr)); - - new_obj.set_class (get_class ()); - - retval = new_obj.subsref (type, idx, nargout, skip, cls, auto_add); - } + { + refcount++; + + cdef_object this_obj (this); + + Array<cdef_object> arr (dim_vector (1, 1), this_obj); + + cdef_object new_obj = cdef_object (new cdef_object_array (arr)); + + new_obj.set_class (get_class ()); + + retval = new_obj.subsref (type, idx, nargout, skip, cls, auto_add); + } break; default: @@ -1506,81 +1511,81 @@ switch (type[0]) { case '.': - { - std::string name = (idx.front ())(0).string_value (); - - if (! error_state) - { - cdef_property prop = cls.find_property (name); - - if (prop.ok ()) - { - if (prop.is_constant ()) - error ("subsasgn: cannot assign constant property: %s", - name.c_str ()); - else - { - refcount++; - - cdef_object obj (this); - - if (type.length () == 1) - { - prop.set_value (obj, rhs, true, "subsasgn"); - - if (! error_state) - retval = to_ov (obj); - } - else - { - octave_value val = - prop.get_value (obj, true, "subsasgn"); - - if (! error_state) - { - std::list<octave_value_list> args (idx); - - args.erase (args.begin ()); - - val = val.assign (octave_value::op_asn_eq, - type.substr (1), args, rhs); - - if (! error_state) - { - if (val.class_name () != "object" - || ! to_cdef (val).is_handle_object ()) - prop.set_value (obj, val, true, "subsasgn"); - - if (! error_state) - retval = to_ov (obj); - } - } - } - } - } - else - error ("subsasgn: unknown property: %s", name.c_str ()); - } - } + { + std::string name = (idx.front ())(0).string_value (); + + if (! error_state) + { + cdef_property prop = cls.find_property (name); + + if (prop.ok ()) + { + if (prop.is_constant ()) + error ("subsasgn: cannot assign constant property: %s", + name.c_str ()); + else + { + refcount++; + + cdef_object obj (this); + + if (type.length () == 1) + { + prop.set_value (obj, rhs, true, "subsasgn"); + + if (! error_state) + retval = to_ov (obj); + } + else + { + octave_value val = + prop.get_value (obj, true, "subsasgn"); + + if (! error_state) + { + std::list<octave_value_list> args (idx); + + args.erase (args.begin ()); + + val = val.assign (octave_value::op_asn_eq, + type.substr (1), args, rhs); + + if (! error_state) + { + if (val.class_name () != "object" + || ! to_cdef (val).is_handle_object ()) + prop.set_value (obj, val, true, "subsasgn"); + + if (! error_state) + retval = to_ov (obj); + } + } + } + } + } + else + error ("subsasgn: unknown property: %s", name.c_str ()); + } + } break; case '(': - { - refcount++; - - cdef_object this_obj (this); - - Array<cdef_object> arr (dim_vector (1, 1), this_obj); - - cdef_object new_obj = cdef_object (new cdef_object_array (arr)); - - new_obj.set_class (get_class ()); - - octave_value tmp = new_obj.subsasgn (type, idx, rhs); - - if (! error_state) - retval = tmp; - } + { + refcount++; + + cdef_object this_obj (this); + + Array<cdef_object> arr (dim_vector (1, 1), this_obj); + + cdef_object new_obj = cdef_object (new cdef_object_array (arr)); + + new_obj.set_class (get_class ()); + + octave_value tmp = new_obj.subsasgn (type, idx, rhs); + + if (! error_state) + retval = tmp; + } break; default: @@ -1620,44 +1625,44 @@ switch (type[0]) { case '(': - { - const octave_value_list& ival = idx.front (); - bool is_scalar = true; - Array<idx_vector> iv (dim_vector (1, ival.length ())); - - for (int i = 0; ! error_state && i < ival.length (); i++) - { - iv(i) = ival(i).index_vector (); - if (! error_state) - is_scalar = is_scalar && iv(i).is_scalar (); - } - - if (! error_state) - { - Array<cdef_object> ires = array.index (iv, auto_add); - - if (! error_state) - { - // If resizing is enabled (auto_add = true), it's possible - // indexing was out-of-bound and the result array contains - // invalid cdef_objects. - - if (auto_add) - fill_empty_values (ires); - - if (is_scalar) - retval(0) = to_ov (ires(0)); - else - { - cdef_object array_obj (new cdef_object_array (ires)); - - array_obj.set_class (get_class ()); - - retval(0) = to_ov (array_obj); - } - } - } - } + { + const octave_value_list& ival = idx.front (); + bool is_scalar = true; + Array<idx_vector> iv (dim_vector (1, ival.length ())); + + for (int i = 0; ! error_state && i < ival.length (); i++) + { + iv(i) = ival(i).index_vector (); + if (! error_state) + is_scalar = is_scalar && iv(i).is_scalar (); + } + + if (! error_state) + { + Array<cdef_object> ires = array.index (iv, auto_add); + + if (! error_state) + { + // If resizing is enabled (auto_add = true), it's possible + // indexing was out-of-bound and the result array contains + // invalid cdef_objects. + + if (auto_add) + fill_empty_values (ires); + + if (is_scalar) + retval(0) = to_ov (ires(0)); + else + { + cdef_object array_obj (new cdef_object_array (ires)); + + array_obj.set_class (get_class ()); + + retval(0) = to_ov (array_obj); + } + } + } + } break; case '.': @@ -1900,13 +1905,15 @@ } } -bool cdef_object_scalar::is_constructed_for (const cdef_class& cls) const +bool +cdef_object_scalar::is_constructed_for (const cdef_class& cls) const { return (is_constructed () || ctor_list.find (cls) == ctor_list.end ()); } -bool cdef_object_scalar::is_partially_constructed_for (const cdef_class& cls) const +bool +cdef_object_scalar::is_partially_constructed_for (const cdef_class& cls) const { std::map< cdef_class, std::list<cdef_class> >::const_iterator it; @@ -1940,9 +1947,10 @@ #endif } -cdef_class::cdef_class_rep::cdef_class_rep (const std::list<cdef_class>& superclasses) - : cdef_meta_object_rep (), member_count (0), handle_class (false), - object_count (0), meta (false) +cdef_class::cdef_class_rep::cdef_class_rep (const std::list<cdef_class>& + superclasses) + : cdef_meta_object_rep (), member_count (0), handle_class (false), + object_count (0), meta (false) { put ("SuperClasses", to_ov (superclasses)); implicit_ctor_list = superclasses; @@ -1997,63 +2005,63 @@ : tree_walker (), who (ctor), obj_name (obj) { } void visit_statement_list (tree_statement_list& t) - { - for (tree_statement_list::const_iterator it = t.begin (); - ! error_state && it != t.end (); ++it) - (*it)->accept (*this); - } + { + for (tree_statement_list::const_iterator it = t.begin (); + ! error_state && it != t.end (); ++it) + (*it)->accept (*this); + } void visit_statement (tree_statement& t) - { - if (t.is_expression ()) - t.expression ()->accept (*this); - } + { + if (t.is_expression ()) + t.expression ()->accept (*this); + } void visit_simple_assignment (tree_simple_assignment& t) - { - t.right_hand_side ()->accept (*this); - } + { + t.right_hand_side ()->accept (*this); + } void visit_multi_assignment (tree_multi_assignment& t) - { - t.right_hand_side ()->accept (*this); - } + { + t.right_hand_side ()->accept (*this); + } void visit_index_expression (tree_index_expression& t) - { - t.expression ()->accept (*this); - } + { + t.expression ()->accept (*this); + } void visit_funcall (tree_funcall& t) - { - octave_value fcn = t.function (); - - if (fcn.is_function ()) - { - octave_function *of = fcn.function_value (true); - - if (of) - { - if (of->name () == "__superclass_reference__") - { - octave_value_list args = t.arguments (); - - if (args(0).string_value () == obj_name) - { - std::string class_name = args(1).string_value (); - - cdef_class cls = lookup_class (class_name, false); - - if (cls.ok ()) - ctor_list.push_back (cls); - } - } - } - } - } + { + octave_value fcn = t.function (); + + if (fcn.is_function ()) + { + octave_function *of = fcn.function_value (true); + + if (of) + { + if (of->name () == "__superclass_reference__") + { + octave_value_list args = t.arguments (); + + if (args(0).string_value () == obj_name) + { + std::string class_name = args(1).string_value (); + + cdef_class cls = lookup_class (class_name, false); + + if (cls.ok ()) + ctor_list.push_back (cls); + } + } + } + } + } std::list<cdef_class> get_constructor_list (void) const - { return ctor_list; } + { return ctor_list; } // NO-OP void visit_anon_fcn_handle (tree_anon_fcn_handle&) { } @@ -2138,8 +2146,10 @@ std::list<cdef_class> explicit_ctor_list = a.get_constructor_list (); - for (std::list<cdef_class>::const_iterator it = explicit_ctor_list.begin (); - ! error_state && it != explicit_ctor_list.end (); ++it) + for (std::list<cdef_class>::const_iterator + it = explicit_ctor_list.begin (); + ! error_state && it != explicit_ctor_list.end (); + ++it) { #if DEBUG_TRACE std::cerr << "explicit superclass constructor: " @@ -2177,8 +2187,8 @@ int idx = 0; - for (std::map<std::string,cdef_method>::const_iterator it = meths.begin (); - it != meths.end (); ++it, ++idx) + for (std::map<std::string,cdef_method>::const_iterator + it = meths.begin (); it != meths.end (); ++it, ++idx) c (idx, 0) = to_ov (it->second); return c; @@ -2188,7 +2198,8 @@ } void -cdef_class::cdef_class_rep::find_methods (std::map<std::string, cdef_method>& meths, +cdef_class::cdef_class_rep::find_methods (std::map<std::string, + cdef_method>& meths, bool only_inherited) { load_all_methods (); @@ -2286,8 +2297,8 @@ int idx = 0; - for (std::map<std::string,cdef_property>::const_iterator it = props.begin (); - it != props.end (); ++it, ++idx) + for (std::map<std::string,cdef_property>::const_iterator + it = props.begin (); it != props.end (); ++it, ++idx) c (idx, 0) = to_ov (it->second); return c; @@ -2307,7 +2318,8 @@ } void -cdef_class::cdef_class_rep::find_properties (std::map<std::string,cdef_property>& props, +cdef_class::cdef_class_rep::find_properties (std::map<std::string, + cdef_property>& props, int mode) { property_const_iterator it; @@ -2565,7 +2577,8 @@ { // Populate the object with default property values - std::list<cdef_class> super_classes = lookup_classes (get ("SuperClasses").cell_value ()); + std::list<cdef_class> super_classes = lookup_classes ( + get ("SuperClasses").cell_value ()); if (! error_state) { @@ -2792,7 +2805,8 @@ if (t->superclass_list ()) { - for (tree_classdef_superclass_list::iterator it = t->superclass_list ()->begin (); + for (tree_classdef_superclass_list::iterator it = + t->superclass_list ()->begin (); ! error_state && it != t->superclass_list ()->end (); ++it) { std::string sclass_name = (*it)->class_name (); @@ -2839,8 +2853,10 @@ if (t->attribute_list ()) { - for (tree_classdef_attribute_list::iterator it = t->attribute_list ()->begin (); - it != t->attribute_list ()->end (); ++it) + for (tree_classdef_attribute_list::iterator + it = t->attribute_list ()->begin (); + it != t->attribute_list ()->end (); + ++it) { std::string aname = (*it)->ident ()->name (); octave_value avalue = compute_attribute_value (*it); @@ -2881,7 +2897,8 @@ if ((*it)->attribute_list ()) { - for (tree_classdef_attribute_list::iterator ait = (*it)->attribute_list ()->begin (); + for (tree_classdef_attribute_list::iterator ait = + (*it)->attribute_list ()->begin (); ait != (*it)->attribute_list ()->end (); ++ait) { std::string aname = (*ait)->ident ()->name (); @@ -2901,7 +2918,8 @@ if ((*it)->element_list ()) { - for (tree_classdef_methods_list::iterator mit = (*it)->element_list ()->begin (); + for (tree_classdef_methods_list::iterator mit = + (*it)->element_list ()->begin (); mit != (*it)->element_list ()->end (); ++mit) { std::string mname = mit->function_value ()->name (); @@ -2918,12 +2936,13 @@ cdef_method meth = make_method (retval, mname, *mit); #if DEBUG_TRACE - std::cerr << (mname == class_name ? "constructor" : "method") + std::cerr << (mname == class_name ? "constructor" + : "method") << ": " << mname << std::endl; #endif - for (std::map<std::string, octave_value>::iterator ait = amap.begin (); - ait != amap.end (); ++ait) + for (std::map<std::string, octave_value>::iterator + ait = amap.begin (); ait != amap.end (); ++ait) meth.put (ait->first, ait->second); retval.install_method (meth); @@ -2945,8 +2964,10 @@ std::list<std::string> external_methods = load_path::methods (full_class_name); - for (std::list<std::string>::const_iterator it = external_methods.begin (); - it != external_methods.end (); ++it) + for (std::list<std::string>::const_iterator + it = external_methods.begin (); + it != external_methods.end (); + ++it) { // TODO: should we issue a warning if the method is already // defined in the classdef file? @@ -2976,7 +2997,8 @@ // symbol should be added to the scope before evaluating default // value expressions. - std::list<tree_classdef_properties_block *> pb_list = b->properties_list (); + std::list<tree_classdef_properties_block *> pb_list + = b->properties_list (); for (tree_classdef_body::properties_list_iterator it = pb_list.begin (); it != pb_list.end (); ++it) @@ -2991,7 +3013,8 @@ if ((*it)->attribute_list ()) { - for (tree_classdef_attribute_list::iterator ait = (*it)->attribute_list ()->begin (); + for (tree_classdef_attribute_list::iterator ait = + (*it)->attribute_list ()->begin (); ait != (*it)->attribute_list ()->end (); ++ait) { std::string aname = (*ait)->ident ()->name (); @@ -3017,7 +3040,8 @@ if ((*it)->element_list ()) { - for (tree_classdef_property_list::iterator pit = (*it)->element_list ()->begin (); + for (tree_classdef_property_list::iterator pit = + (*it)->element_list ()->begin (); pit != (*it)->element_list ()->end (); ++pit) { std::string prop_name = (*pit)->ident ()->name (); @@ -3042,17 +3066,18 @@ prop.put ("DefaultValue", pvalue); } - // Install property attributes. This is done before assigning the - // property accessors so we can do validationby using cdef_property - // methods. + // Install property attributes. This is done before assigning + // the property accessors so we can do validationby using + // cdef_property methods. for (std::map<std::string, octave_value>::iterator ait = amap.begin (); ait != amap.end (); ++ait) prop.put (ait->first, ait->second); - // Install property access methods, if any. Remove the accessor - // methods from the temporary storage map, so we can detect which - // ones are invalid and do not correspond to a defined property. + // Install property access methods, if any. Remove the + // accessor methods from the temporary storage map, so we can + // detect which ones are invalid and do not correspond to a + // defined property. std::map<std::string, octave_value>::iterator git = get_methods.find (prop_name); @@ -3479,8 +3504,7 @@ } static octave_value_list -package_getAllPackages (const octave_value_list& /* args */, - int /* nargout */) +package_getAllPackages (const octave_value_list& /* args */, int /* nargout */) { std::map<std::string, cdef_package> toplevel_packages; @@ -3497,7 +3521,8 @@ int i = 0; - for (std::map<std::string, cdef_package>::const_iterator it = toplevel_packages.begin (); + for (std::map<std::string, cdef_package>::const_iterator it = + toplevel_packages.begin (); it != toplevel_packages.end (); ++it) c(i++,0) = to_ov (it->second); @@ -3984,7 +4009,7 @@ } DEFUN (__superclass_reference__, args, /* nargout */, - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} __superclass_reference__ ()\n\ Undocumented internal function.\n\ @end deftypefn") @@ -3993,7 +4018,7 @@ } DEFUN (__meta_class_query__, args, /* nargout */, - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} __meta_class_query__ ()\n\ Undocumented internal function.\n\ @end deftypefn") @@ -4022,7 +4047,7 @@ } DEFUN (metaclass, args, /* nargout */, - "-*- texinfo -*-\n\ + "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} metaclass (obj)\n\ Returns the meta.class object corresponding to the class of @var{obj}.\n\ @end deftypefn")
--- a/libinterp/octave-value/ov-classdef.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/octave-value/ov-classdef.h Wed Feb 25 11:55:49 2015 -0800 @@ -57,31 +57,31 @@ virtual cdef_class get_class (void) const; virtual void set_class (const cdef_class&) - { gripe_invalid_object ("set_class"); } + { gripe_invalid_object ("set_class"); } virtual cdef_object_rep* clone (void) const - { - gripe_invalid_object ("clone"); - return new cdef_object_rep (); - } + { + gripe_invalid_object ("clone"); + return new cdef_object_rep (); + } virtual cdef_object_rep* empty_clone (void) const - { - gripe_invalid_object ("empty_clone"); - return new cdef_object_rep (); - } + { + gripe_invalid_object ("empty_clone"); + return new cdef_object_rep (); + } virtual cdef_object_rep* copy (void) const - { - gripe_invalid_object ("copy"); - return new cdef_object_rep (); - } + { + gripe_invalid_object ("copy"); + return new cdef_object_rep (); + } virtual cdef_object_rep* make_array (void) const - { - gripe_invalid_object ("make_array"); - return new cdef_object_rep (); - } + { + gripe_invalid_object ("make_array"); + return new cdef_object_rep (); + } virtual bool is_array (void) const { return false; } @@ -92,35 +92,35 @@ virtual bool is_meta_object (void) const { return false; } virtual Array<cdef_object> array_value (void) const - { - gripe_invalid_object ("array_value"); - return Array<cdef_object> (); - } + { + gripe_invalid_object ("array_value"); + return Array<cdef_object> (); + } virtual void put (const std::string&, const octave_value&) - { gripe_invalid_object ("put"); } + { gripe_invalid_object ("put"); } virtual octave_value get (const std::string&) const - { - gripe_invalid_object ("get"); - return octave_value (); - } + { + gripe_invalid_object ("get"); + return octave_value (); + } virtual octave_value_list subsref (const std::string&, const std::list<octave_value_list>&, int, size_t&, const cdef_class&, bool) - { - gripe_invalid_object ("subsref"); - return octave_value_list (); - } + { + gripe_invalid_object ("subsref"); + return octave_value_list (); + } virtual octave_value subsasgn (const std::string&, const std::list<octave_value_list>&, const octave_value&) - { - gripe_invalid_object ("subsasgn"); - return octave_value (); - } + { + gripe_invalid_object ("subsasgn"); + return octave_value (); + } virtual string_vector map_keys (void) const; @@ -129,41 +129,41 @@ std::string class_name (void) const; virtual void mark_for_construction (const cdef_class&) - { gripe_invalid_object ("mark_for_construction"); } + { gripe_invalid_object ("mark_for_construction"); } virtual bool is_constructed_for (const cdef_class&) const - { - gripe_invalid_object ("is_constructed_for"); - return false; - } + { + gripe_invalid_object ("is_constructed_for"); + return false; + } virtual bool is_partially_constructed_for (const cdef_class&) const - { - gripe_invalid_object ("is_partially_constructed_for"); - return false; - } + { + gripe_invalid_object ("is_partially_constructed_for"); + return false; + } virtual void mark_as_constructed (void) - { gripe_invalid_object ("mark_as_constructed"); } + { gripe_invalid_object ("mark_as_constructed"); } virtual void mark_as_constructed (const cdef_class&) - { gripe_invalid_object ("mark_as_constructed"); } + { gripe_invalid_object ("mark_as_constructed"); } virtual bool is_constructed (void) const - { - gripe_invalid_object ("is_constructed"); - return false; - } + { + gripe_invalid_object ("is_constructed"); + return false; + } virtual octave_idx_type static_count (void) const { return 0; } virtual void destroy (void) { delete this; } void release (void) - { - if (--refcount == static_count ()) - destroy (); - } + { + if (--refcount == static_count ()) + destroy (); + } virtual dim_vector dims (void) const { return dim_vector (); } @@ -181,7 +181,7 @@ cdef_object_rep& operator = (const cdef_object_rep& ); void gripe_invalid_object (const char *who) const - { error ("%s: invalid object", who); } + { error ("%s: invalid object", who); } }; class @@ -190,53 +190,53 @@ public: /* FIXME: use a null object */ cdef_object (void) - : rep (new cdef_object_rep ()) { } + : rep (new cdef_object_rep ()) { } cdef_object (const cdef_object& obj) : rep (obj.rep) - { - rep->refcount++; - } + { + rep->refcount++; + } cdef_object (cdef_object_rep *r) - : rep (r) { } + : rep (r) { } virtual ~cdef_object (void) - { rep->release (); } + { rep->release (); } cdef_object& operator = (const cdef_object& obj) - { - if (rep != obj.rep) - { - rep->release (); + { + if (rep != obj.rep) + { + rep->release (); - rep = obj.rep; - rep->refcount++; - } + rep = obj.rep; + rep->refcount++; + } - return *this; - } + return *this; + } cdef_class get_class (void) const; void set_class (const cdef_class& cls) { rep->set_class (cls); } std::string class_name (void) const - { return rep->class_name (); } + { return rep->class_name (); } cdef_object clone (void) const - { return cdef_object (rep->clone ()); } + { return cdef_object (rep->clone ()); } cdef_object empty_clone (void) const - { return cdef_object (rep->empty_clone ()); } + { return cdef_object (rep->empty_clone ()); } dim_vector dims (void) const { return rep->dims (); } cdef_object make_array (void) const - { return cdef_object (rep->make_array ()); } + { return cdef_object (rep->make_array ()); } cdef_object copy (void) const - { return cdef_object (rep->copy ()); } + { return cdef_object (rep->copy ()); } bool is_array (void) const { return rep->is_array (); } @@ -249,24 +249,24 @@ Array<cdef_object> array_value (void) const { return rep->array_value (); } void put (const std::string& pname, const octave_value& val) - { rep->put (pname, val); } + { rep->put (pname, val); } octave_value get (const std::string& pname) const - { return rep->get (pname); } + { return rep->get (pname); } octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout, size_t& skip, const cdef_class& context, bool auto_add = false) - { return rep->subsref (type, idx, nargout, skip, context, auto_add); } + { return rep->subsref (type, idx, nargout, skip, context, auto_add); } octave_value subsasgn (const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs, int ignore_copies = 0) - { - make_unique (ignore_copies); - return rep->subsasgn (type, idx, rhs); - } + { + make_unique (ignore_copies); + return rep->subsasgn (type, idx, rhs); + } string_vector map_keys (void) const { return rep->map_keys (); } @@ -277,20 +277,20 @@ bool ok (void) const { return rep->is_valid (); } void mark_for_construction (const cdef_class& cls) - { rep->mark_for_construction (cls); } + { rep->mark_for_construction (cls); } bool is_constructed (void) const { return rep->is_constructed (); } bool is_constructed_for (const cdef_class& cls) const - { return rep->is_constructed_for (cls); } + { return rep->is_constructed_for (cls); } bool is_partially_constructed_for (const cdef_class& cls) const - { return rep->is_partially_constructed_for (cls); } + { return rep->is_partially_constructed_for (cls); } void mark_as_constructed (void) { rep->mark_as_constructed (); } void mark_as_constructed (const cdef_class& cls) - { rep->mark_as_constructed (cls); } + { rep->mark_as_constructed (cls); } bool is (const cdef_object& obj) const { return rep == obj.rep; } @@ -298,10 +298,10 @@ cdef_object_rep* get_rep (void) { return rep; } void make_unique (int ignore_copies) - { - if (rep->refcount > ignore_copies + 1) - *this = clone (); - } + { + if (rep->refcount > ignore_copies + 1) + *this = clone (); + } private: cdef_object_rep *rep; @@ -313,9 +313,9 @@ public: cdef_object_base (void) : cdef_object_rep (), klass () - { - register_object (); - } + { + register_object (); + } ~cdef_object_base (void) { unregister_object (); } @@ -324,7 +324,7 @@ void set_class (const cdef_class& cls); cdef_object_rep* empty_clone (void) const - { return new cdef_object_base (*this); } + { return new cdef_object_base (*this); } cdef_object_rep* make_array (void) const; @@ -332,9 +332,9 @@ // Restricted copying! cdef_object_base (const cdef_object_base& obj) : cdef_object_rep (obj), klass (obj.klass) - { - register_object (); - } + { + register_object (); + } private: void register_object (void); @@ -360,7 +360,7 @@ : cdef_object_base (), array (a) { } cdef_object_rep* clone (void) const - { return new cdef_object_array (*this); } + { return new cdef_object_array (*this); } dim_vector dims (void) const { return array.dims (); } @@ -406,20 +406,20 @@ dim_vector dims (void) const { return dim_vector (1, 1); } void put (const std::string& pname, const octave_value& val) - { map.assign (pname, val); } + { map.assign (pname, val); } octave_value get (const std::string& pname) const - { - Cell val = map.contents (pname); + { + Cell val = map.contents (pname); - if (val.numel () > 0) - return val(0, 0); - else - { - error ("get: unknown slot: %s", pname.c_str ()); - return octave_value (); - } - } + if (val.numel () > 0) + return val(0, 0); + else + { + error ("get: unknown slot: %s", pname.c_str ()); + return octave_value (); + } + } octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, @@ -464,19 +464,19 @@ { public: handle_cdef_object (void) - : cdef_object_scalar () { } + : cdef_object_scalar () { } ~handle_cdef_object (void); cdef_object_rep* clone (void) const - { - handle_cdef_object *obj = const_cast<handle_cdef_object *> (this); - obj->refcount++; - return obj; - } + { + handle_cdef_object *obj = const_cast<handle_cdef_object *> (this); + obj->refcount++; + return obj; + } cdef_object_rep* copy (void) const - { return new handle_cdef_object (*this); } + { return new handle_cdef_object (*this); } bool is_valid (void) const { return true; } @@ -497,12 +497,12 @@ { public: value_cdef_object (void) - : cdef_object_scalar () { } + : cdef_object_scalar () { } ~value_cdef_object (void); cdef_object_rep* clone (void) const - { return new value_cdef_object (*this); } + { return new value_cdef_object (*this); } cdef_object_rep* copy (void) const { return clone (); } @@ -529,7 +529,7 @@ ~cdef_meta_object_rep (void) { } cdef_object_rep* copy (void) const - { return new cdef_meta_object_rep (*this); } + { return new cdef_meta_object_rep (*this); } bool is_meta_object (void) const { return true; } @@ -545,15 +545,15 @@ meta_subsref (const std::string& /* type */, const std::list<octave_value_list>& /* idx */, int /* nargout */) - { - ::error ("subsref: invalid meta object"); - return octave_value_list (); - } + { + ::error ("subsref: invalid meta object"); + return octave_value_list (); + } virtual void meta_release (void) { } virtual bool meta_is_postfix_index_handled (char /* type */) const - { return false; } + { return false; } protected: // Restricted copying! @@ -595,19 +595,19 @@ octave_value_list meta_subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout) - { return get_rep ()->meta_subsref (type, idx, nargout); } + { return get_rep ()->meta_subsref (type, idx, nargout); } void meta_release (void) { get_rep ()->meta_release (); } bool meta_is_postfix_index_handled (char type) const - { return get_rep ()->meta_is_postfix_index_handled (type); } + { return get_rep ()->meta_is_postfix_index_handled (type); } private: cdef_meta_object_rep* get_rep (void) - { return dynamic_cast<cdef_meta_object_rep *> (cdef_object::get_rep ()); } + { return dynamic_cast<cdef_meta_object_rep *> (cdef_object::get_rep ()); } const cdef_meta_object_rep* get_rep (void) const - { return dynamic_cast<const cdef_meta_object_rep *> (cdef_object::get_rep ()); } + { return dynamic_cast<const cdef_meta_object_rep *> (cdef_object::get_rep ()); } }; class @@ -620,8 +620,8 @@ { public: cdef_class_rep (void) - : cdef_meta_object_rep (), member_count (0), handle_class (false), - object_count (0), meta (false) { } + : cdef_meta_object_rep (), member_count (0), handle_class (false), + object_count (0), meta (false) { } cdef_class_rep (const std::list<cdef_class>& superclasses); @@ -630,7 +630,7 @@ bool is_class (void) const { return true; } std::string get_name (void) const - { return get ("Name").string_value (); } + { return get ("Name").string_value (); } void set_name (const std::string& nm) { put ("Name", nm); } @@ -667,7 +667,7 @@ void meta_release (void); bool meta_is_postfix_index_handled (char type) const - { return (type == '(' || type == '.'); } + { return (type == '(' || type == '.'); } octave_value construct (const octave_value_list& args); @@ -688,19 +688,19 @@ octave_idx_type static_count (void) const { return member_count; } void destroy (void) - { - if (member_count) - { - refcount++; - cdef_class lock (this); + { + if (member_count) + { + refcount++; + cdef_class lock (this); - member_count = 0; - method_map.clear (); - property_map.clear (); - } - else - delete this; - } + member_count = 0; + method_map.clear (); + property_map.clear (); + } + else + delete this; + } void mark_as_meta_class (void) { meta = true; } @@ -718,10 +718,10 @@ bool only_inherited); cdef_class wrap (void) - { - refcount++; - return cdef_class (this); - } + { + refcount++; + return cdef_class (this); + } private: // The @-directory were this class is loaded from. @@ -770,50 +770,50 @@ public: // Create and invalid class object cdef_class (void) - : cdef_meta_object () { } + : cdef_meta_object () { } cdef_class (const std::string& nm, const std::list<cdef_class>& superclasses) - : cdef_meta_object (new cdef_class_rep (superclasses)) - { get_rep ()->set_name (nm); } + : cdef_meta_object (new cdef_class_rep (superclasses)) + { get_rep ()->set_name (nm); } cdef_class (const cdef_class& cls) - : cdef_meta_object (cls) { } + : cdef_meta_object (cls) { } cdef_class (const cdef_object& obj) - : cdef_meta_object (obj) - { - // This should never happen... - if (! is_class ()) - error ("internal error: invalid assignment from %s to meta.class object", - class_name ().c_str ()); - } + : cdef_meta_object (obj) + { + // This should never happen... + if (! is_class ()) + error ("internal error: invalid assignment from %s to meta.class object", + class_name ().c_str ()); + } cdef_class& operator = (const cdef_class& cls) - { - cdef_object::operator= (cls); + { + cdef_object::operator= (cls); - return *this; - } + return *this; + } cdef_method find_method (const std::string& nm, bool local = false); void install_method (const cdef_method& meth) - { get_rep ()->install_method (meth); } + { get_rep ()->install_method (meth); } Cell get_methods (void) { return get_rep ()->get_methods (); } cdef_property find_property (const std::string& nm); void install_property (const cdef_property& prop) - { get_rep ()->install_property (prop); } + { get_rep ()->install_property (prop); } Cell get_properties (int mode = property_normal) - { return get_rep ()->get_properties (mode); } + { return get_rep ()->get_properties (mode); } std::map<std::string, cdef_property> get_property_map (int mode = property_normal) - { return get_rep ()->get_property_map (mode); } + { return get_rep ()->get_property_map (mode); } string_vector get_names (void) { return get_rep ()->get_names (); } @@ -822,19 +822,19 @@ bool is_sealed (void) const { return get_rep ()->is_sealed (); } void set_directory (const std::string& dir) - { get_rep ()->set_directory (dir); } + { get_rep ()->set_directory (dir); } std::string get_directory (void) const - { return get_rep ()->get_directory (); } + { return get_rep ()->get_directory (); } std::string get_name (void) const - { return get_rep ()->get_name (); } + { return get_rep ()->get_name (); } bool is_builtin (void) const - { return get_directory ().empty (); } + { return get_directory ().empty (); } void delete_object (cdef_object obj) - { get_rep ()->delete_object (obj); } + { get_rep ()->delete_object (obj); } static cdef_class make_meta_class (tree_classdef* t, bool is_at_folder = false); @@ -842,25 +842,25 @@ octave_function* get_method_function (const std::string& nm); octave_function* get_constructor_function (void) - { return get_method_function (get_name ()); } + { return get_method_function (get_name ()); } octave_value construct (const octave_value_list& args) - { return get_rep ()->construct (args); } + { return get_rep ()->construct (args); } cdef_object construct_object (const octave_value_list& args) - { return get_rep ()->construct_object (args); } + { return get_rep ()->construct_object (args); } void initialize_object (cdef_object& obj) - { get_rep ()->initialize_object (obj); } + { get_rep ()->initialize_object (obj); } void run_constructor (cdef_object& obj, const octave_value_list& args) - { get_rep ()->run_constructor (obj, args); } + { get_rep ()->run_constructor (obj, args); } void mark_as_handle_class (void) - { get_rep ()->mark_as_handle_class (); } + { get_rep ()->mark_as_handle_class (); } bool is_handle_class (void) const - { return get_rep ()->is_handle_class (); } + { return get_rep ()->is_handle_class (); } void mark_as_meta_class (void) { get_rep ()->mark_as_meta_class (); } @@ -877,18 +877,18 @@ public: enum - { - property_normal, - property_inherited, - property_all - }; + { + property_normal, + property_inherited, + property_all + }; private: cdef_class_rep* get_rep (void) - { return dynamic_cast<cdef_class_rep *> (cdef_object::get_rep ()); } + { return dynamic_cast<cdef_class_rep *> (cdef_object::get_rep ()); } const cdef_class_rep* get_rep (void) const - { return dynamic_cast<const cdef_class_rep *> (cdef_object::get_rep ()); } + { return dynamic_cast<const cdef_class_rep *> (cdef_object::get_rep ()); } friend bool operator == (const cdef_class&, const cdef_class&); friend bool operator != (const cdef_class&, const cdef_class&); @@ -929,7 +929,7 @@ { public: cdef_property_rep (void) - : cdef_meta_object_rep () { } + : cdef_meta_object_rep () { } cdef_object_rep* copy (void) const { return new cdef_property_rep (*this); } @@ -963,56 +963,56 @@ bool is_recursive_set (const cdef_object& obj) const; cdef_property wrap (void) - { - refcount++; - return cdef_property (this); - } + { + refcount++; + return cdef_property (this); + } }; public: cdef_property (void) : cdef_meta_object () { } cdef_property (const std::string& nm) - : cdef_meta_object (new cdef_property_rep ()) - { get_rep ()->set_name (nm); } + : cdef_meta_object (new cdef_property_rep ()) + { get_rep ()->set_name (nm); } cdef_property (const cdef_property& prop) - : cdef_meta_object (prop) { } + : cdef_meta_object (prop) { } cdef_property (const cdef_object& obj) - : cdef_meta_object (obj) - { - // This should never happen... - if (! is_property ()) - error ("internal error: invalid assignment from %s to meta.property object", - class_name ().c_str ()); - } + : cdef_meta_object (obj) + { + // This should never happen... + if (! is_property ()) + error ("internal error: invalid assignment from %s to meta.property object", + class_name ().c_str ()); + } cdef_property& operator = (const cdef_property& prop) - { - cdef_object::operator= (prop); + { + cdef_object::operator= (prop); - return *this; - } + return *this; + } octave_value get_value (const cdef_object& obj, bool do_check_access = true, const std::string& who = std::string ()) - { return get_rep ()->get_value (obj, do_check_access, who); } + { return get_rep ()->get_value (obj, do_check_access, who); } octave_value get_value (bool do_check_access = true, const std::string& who = std::string ()) - { return get_rep ()->get_value (do_check_access, who); } + { return get_rep ()->get_value (do_check_access, who); } void set_value (cdef_object& obj, const octave_value& val, bool do_check_access = true, const std::string& who = std::string ()) - { get_rep ()->set_value (obj, val, do_check_access, who); } + { get_rep ()->set_value (obj, val, do_check_access, who); } bool check_get_access (void) const - { return get_rep ()->check_get_access (); } + { return get_rep ()->check_get_access (); } bool check_set_access (void) const - { return get_rep ()->check_set_access (); } + { return get_rep ()->check_set_access (); } std::string get_name (void) const { return get_rep ()->get_name (); } @@ -1020,10 +1020,10 @@ private: cdef_property_rep* get_rep (void) - { return dynamic_cast<cdef_property_rep *> (cdef_object::get_rep ()); } + { return dynamic_cast<cdef_property_rep *> (cdef_object::get_rep ()); } const cdef_property_rep* get_rep (void) const - { return dynamic_cast<const cdef_property_rep *> (cdef_object::get_rep ()); } + { return dynamic_cast<const cdef_property_rep *> (cdef_object::get_rep ()); } }; class @@ -1039,7 +1039,7 @@ public: cdef_method_rep (void) : cdef_meta_object_rep (), function (), dispatch_type () - { } + { } cdef_object_rep* copy (void) const { return new cdef_method_rep(*this); } @@ -1060,7 +1060,7 @@ bool is_external (void) const { return ! dispatch_type.empty (); } void mark_as_external (const std::string& dtype) - { dispatch_type = dtype; } + { dispatch_type = dtype; } octave_value_list execute (const octave_value_list& args, int nargout, bool do_check_access = true, @@ -1078,21 +1078,21 @@ const std::list<octave_value_list>& idx, int nargout); bool meta_is_postfix_index_handled (char type) const - { return (type == '(' || type == '.'); } + { return (type == '(' || type == '.'); } private: cdef_method_rep (const cdef_method_rep& m) : cdef_meta_object_rep (m), function (m.function), dispatch_type (m.dispatch_type) - { } + { } void check_method (void); cdef_method wrap (void) - { - refcount++; - return cdef_method (this); - } + { + refcount++; + return cdef_method (this); + } private: octave_value function; @@ -1106,40 +1106,40 @@ cdef_method (void) : cdef_meta_object () { } cdef_method (const std::string& nm) - : cdef_meta_object (new cdef_method_rep ()) - { get_rep ()->set_name (nm); } + : cdef_meta_object (new cdef_method_rep ()) + { get_rep ()->set_name (nm); } cdef_method (const cdef_method& meth) - : cdef_meta_object (meth) { } + : cdef_meta_object (meth) { } cdef_method (const cdef_object& obj) - : cdef_meta_object (obj) - { - // This should never happen... - if (! is_method ()) - error ("internal error: invalid assignment from %s to meta.method object", - class_name ().c_str ()); - } + : cdef_meta_object (obj) + { + // This should never happen... + if (! is_method ()) + error ("internal error: invalid assignment from %s to meta.method object", + class_name ().c_str ()); + } cdef_method& operator = (const cdef_method& meth) - { - cdef_object::operator= (meth); + { + cdef_object::operator= (meth); - return *this; - } + return *this; + } /* normal invokation */ octave_value_list execute (const octave_value_list& args, int nargout, bool do_check_access = true, const std::string& who = std::string ()) - { return get_rep ()->execute (args, nargout, do_check_access, who); } + { return get_rep ()->execute (args, nargout, do_check_access, who); } /* dot-invokation: object is pushed as 1st argument */ octave_value_list execute (const cdef_object& obj, const octave_value_list& args, int nargout, bool do_check_access = true, const std::string& who = std::string ()) - { return get_rep ()->execute (obj, args, nargout, do_check_access, who); } + { return get_rep ()->execute (obj, args, nargout, do_check_access, who); } bool check_access (void) const { return get_rep ()->check_access (); } @@ -1148,25 +1148,25 @@ bool is_static (void) const { return get_rep ()->is_static (); } void set_function (const octave_value& fcn) - { get_rep ()->set_function (fcn); } + { get_rep ()->set_function (fcn); } octave_value get_function (void) const - { return get_rep ()->get_function (); } + { return get_rep ()->get_function (); } bool is_constructor (void) const - { return get_rep ()->is_constructor (); } + { return get_rep ()->is_constructor (); } bool is_external (void) const { return get_rep ()->is_external (); } void mark_as_external (const std::string& dtype) - { get_rep ()->mark_as_external (dtype); } + { get_rep ()->mark_as_external (dtype); } private: cdef_method_rep* get_rep (void) - { return dynamic_cast<cdef_method_rep *> (cdef_object::get_rep ()); } + { return dynamic_cast<cdef_method_rep *> (cdef_object::get_rep ()); } const cdef_method_rep* get_rep (void) const - { return dynamic_cast<const cdef_method_rep *> (cdef_object::get_rep ()); } + { return dynamic_cast<const cdef_method_rep *> (cdef_object::get_rep ()); } }; inline cdef_class @@ -1282,19 +1282,19 @@ octave_idx_type static_count (void) const { return member_count; } void destroy (void) - { - if (member_count) - { - refcount++; - cdef_package lock (this); + { + if (member_count) + { + refcount++; + cdef_package lock (this); - member_count = 0; - class_map.clear (); - package_map.clear (); - } - else - delete this; - } + member_count = 0; + class_map.clear (); + package_map.clear (); + } + else + delete this; + } octave_value_list meta_subsref (const std::string& type, @@ -1303,7 +1303,7 @@ void meta_release (void); bool meta_is_postfix_index_handled (char type) const - { return (type == '.'); } + { return (type == '.'); } octave_value find (const std::string& nm); @@ -1329,58 +1329,58 @@ : cdef_meta_object_rep (p), full_name (p.full_name), class_map (p.class_map), function_map (p.function_map), package_map (p.package_map), member_count (p.member_count) - { } + { } cdef_package wrap (void) - { - refcount++; - return cdef_package (this); - } + { + refcount++; + return cdef_package (this); + } }; public: cdef_package (void) : cdef_meta_object () { } cdef_package (const std::string& nm) - : cdef_meta_object (new cdef_package_rep ()) - { get_rep ()->set_name (nm); } + : cdef_meta_object (new cdef_package_rep ()) + { get_rep ()->set_name (nm); } cdef_package (const cdef_package& pack) : cdef_meta_object (pack) { } cdef_package (const cdef_object& obj) - : cdef_meta_object (obj) - { - // This should never happen... - if (! is_package ()) - error ("internal error: invalid assignment from %s to meta.package object", - class_name ().c_str ()); - } + : cdef_meta_object (obj) + { + // This should never happen... + if (! is_package ()) + error ("internal error: invalid assignment from %s to meta.package object", + class_name ().c_str ()); + } cdef_package& operator = (const cdef_package& pack) - { - cdef_object::operator= (pack); + { + cdef_object::operator= (pack); - return *this; - } + return *this; + } void install_class (const cdef_class& cls, const std::string& nm) - { get_rep ()->install_class (cls, nm); } + { get_rep ()->install_class (cls, nm); } void install_function (const octave_value& fcn, const std::string& nm) - { get_rep ()->install_function (fcn, nm); } + { get_rep ()->install_function (fcn, nm); } void install_package (const cdef_package& pack, const std::string& nm) - { get_rep ()->install_package (pack, nm); } + { get_rep ()->install_package (pack, nm); } Cell get_classes (void) const - { return get_rep ()->get_classes (); } + { return get_rep ()->get_classes (); } Cell get_functions (void) const - { return get_rep ()->get_functions (); } + { return get_rep ()->get_functions (); } Cell get_packages (void) const - { return get_rep ()->get_packages (); } + { return get_rep ()->get_packages (); } std::string get_name (void) const { return get_rep ()->get_name (); } @@ -1390,10 +1390,10 @@ private: cdef_package_rep* get_rep (void) - { return dynamic_cast<cdef_package_rep *> (cdef_object::get_rep ()); } + { return dynamic_cast<cdef_package_rep *> (cdef_object::get_rep ()); } const cdef_package_rep* get_rep (void) const - { return dynamic_cast<const cdef_package_rep *> (cdef_object::get_rep ()); } + { return dynamic_cast<const cdef_package_rep *> (cdef_object::get_rep ()); } private: static cdef_package _meta; @@ -1406,19 +1406,19 @@ { public: octave_classdef (void) - : octave_base_value (), object () { } + : octave_base_value (), object () { } octave_classdef (const cdef_object& obj) - : octave_base_value (), object (obj) { } + : octave_base_value (), object (obj) { } octave_classdef (const octave_classdef& obj) - : octave_base_value (obj), object (obj.object) { } + : octave_base_value (obj), object (obj.object) { } octave_base_value* clone (void) const - { return new octave_classdef (object.clone ()); } + { return new octave_classdef (object.clone ()); } octave_base_value* empty_clone (void) const - { return new octave_classdef (object.empty_clone ()); } + { return new octave_classdef (object.empty_clone ()); } cdef_object get_object (void) const { return object; } @@ -1449,10 +1449,10 @@ octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx) - { - octave_value_list retval = subsref (type, idx, 1); - return (retval.length () > 0 ? retval(0) : octave_value ()); - } + { + octave_value_list retval = subsref (type, idx, 1); + return (retval.length () > 0 ? retval(0) : octave_value ()); + } octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx, @@ -1547,65 +1547,65 @@ static cdef_class find_class (const std::string& name, bool error_if_not_found = true, bool load_if_not_found = true) - { - if (instance_ok ()) - return instance->do_find_class (name, error_if_not_found, - load_if_not_found); + { + if (instance_ok ()) + return instance->do_find_class (name, error_if_not_found, + load_if_not_found); - return cdef_class (); - } + return cdef_class (); + } static octave_function* find_method_symbol (const std::string& method_name, - const std::string& class_name) - { - if (instance_ok ()) - return instance->do_find_method_symbol (method_name, class_name); + const std::string& class_name) + { + if (instance_ok ()) + return instance->do_find_method_symbol (method_name, class_name); - return 0; - } + return 0; + } static cdef_package find_package (const std::string& name, bool error_if_not_found = true, bool load_if_not_found = true) - { - if (instance_ok ()) - return instance->do_find_package (name, error_if_not_found, - load_if_not_found); + { + if (instance_ok ()) + return instance->do_find_package (name, error_if_not_found, + load_if_not_found); - return cdef_package (); - } + return cdef_package (); + } static octave_function* find_package_symbol (const std::string& pack_name) - { - if (instance_ok ()) - return instance->do_find_package_symbol (pack_name); + { + if (instance_ok ()) + return instance->do_find_package_symbol (pack_name); - return 0; - } + return 0; + } static void register_class (const cdef_class& cls) - { - if (instance_ok ()) - instance->do_register_class (cls); - } + { + if (instance_ok ()) + instance->do_register_class (cls); + } static void unregister_class (const cdef_class& cls) - { - if (instance_ok ()) - instance->do_unregister_class (cls); - } + { + if (instance_ok ()) + instance->do_unregister_class (cls); + } static void register_package (const cdef_package& pkg) - { - if (instance_ok ()) - instance->do_register_package (pkg); - } + { + if (instance_ok ()) + instance->do_register_package (pkg); + } static void unregister_package (const cdef_package& pkg) - { - if (instance_ok ()) - instance->do_unregister_package (pkg); - } + { + if (instance_ok ()) + instance->do_unregister_package (pkg); + } private: @@ -1620,28 +1620,28 @@ static void create_instance (void); static bool instance_ok (void) - { - bool retval = true; + { + bool retval = true; - if (! instance) - create_instance (); + if (! instance) + create_instance (); - if (! instance) - { - ::error ("unable to create cdef_manager!"); + if (! instance) + { + ::error ("unable to create cdef_manager!"); - retval = false; - } + retval = false; + } - return retval; - } + return retval; + } static void cleanup_instance (void) - { - delete instance; + { + delete instance; - instance = 0; - } + instance = 0; + } cdef_class do_find_class (const std::string& name, bool error_if_not_found, bool load_if_not_found); @@ -1656,16 +1656,16 @@ octave_function* do_find_package_symbol (const std::string& pack_name); void do_register_class (const cdef_class& cls) - { all_classes[cls.get_name ()] = cls; } + { all_classes[cls.get_name ()] = cls; } void do_unregister_class (const cdef_class& cls) - { all_classes.erase(cls.get_name ()); } + { all_classes.erase(cls.get_name ()); } void do_register_package (const cdef_package& pkg) - { all_packages[pkg.get_name ()] = pkg; } + { all_packages[pkg.get_name ()] = pkg; } void do_unregister_package (const cdef_package& pkg) - { all_packages.erase(pkg.get_name ()); } + { all_packages.erase(pkg.get_name ()); } private:
--- a/libinterp/octave-value/ov-fcn.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/octave-value/ov-fcn.h Wed Feb 25 11:55:49 2015 -0800 @@ -87,7 +87,7 @@ virtual bool is_classdef_constructor (const std::string& = std::string ()) const - { return false; } + { return false; } virtual bool is_class_method (const std::string& = std::string ()) const { return false; } @@ -161,12 +161,12 @@ std::string name (void) const { return my_name; } std::string canonical_name (void) const - { - if (xpackage_name.empty ()) - return my_name; - else - return xpackage_name + "." + my_name; - } + { + if (xpackage_name.empty ()) + return my_name; + else + return xpackage_name + "." + my_name; + } void document (const std::string& ds) { doc = ds; } @@ -177,7 +177,7 @@ virtual void accept (tree_walker&) { } virtual bool is_postfix_index_handled (char type) const - { return (type == '(' || type == '{'); } + { return (type == '(' || type == '{'); } protected:
--- a/libinterp/octave-value/ov-float.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/octave-value/ov-float.cc Wed Feb 25 11:55:49 2015 -0800 @@ -350,7 +350,7 @@ } default: - return octave_base_value::map (umap); + return octave_base_value::map (umap); } }
--- a/libinterp/octave-value/ov-flt-complex.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/octave-value/ov-flt-complex.cc Wed Feb 25 11:55:49 2015 -0800 @@ -80,7 +80,8 @@ // 1x1 matrix back to a scalar value. Need a better solution // to this problem. - octave_value tmp (new octave_float_complex_matrix (float_complex_matrix_value ())); + octave_value tmp (new octave_float_complex_matrix ( + float_complex_matrix_value ())); return tmp.do_index_op (idx, resize_ok); }
--- a/libinterp/octave-value/ov-java.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/octave-value/ov-java.cc Wed Feb 25 11:55:49 2015 -0800 @@ -57,8 +57,10 @@ #include "parse.h" #include "variables.h" -typedef jint (JNICALL *JNI_CreateJavaVM_t) (JavaVM **pvm, JNIEnv **penv, void *args); -typedef jint (JNICALL *JNI_GetCreatedJavaVMs_t) (JavaVM **pvm, jsize bufLen, jsize *nVMs); +typedef jint (JNICALL *JNI_CreateJavaVM_t) (JavaVM **pvm, JNIEnv **penv, + void *args); +typedef jint (JNICALL *JNI_GetCreatedJavaVMs_t) (JavaVM **pvm, jsize bufLen, + jsize *nVMs); extern "C" { @@ -457,7 +459,8 @@ std::string regval = read_registry_string (key,value); if (regval.empty ()) - throw std::string ("unable to find Java Runtime Environment: ") + key + "::" + value; + throw std::string ("unable to find Java Runtime Environment: ") + + key + "::" + value; value = regval; } @@ -465,7 +468,8 @@ value = "RuntimeLib"; jvm_lib_path = read_registry_string (key, value); if (jvm_lib_path.empty ()) - throw std::string ("unable to find Java Runtime Environment: ") + key + "::" + value; + throw std::string ("unable to find Java Runtime Environment: ") + + key + "::" + value; std::string jvm_bin_path; @@ -500,7 +504,8 @@ octave_shlib lib (jvm_lib_path); if (!lib) - throw std::string ("unable to load Java Runtime Environment from ") + jvm_lib_path; + throw std::string ("unable to load Java Runtime Environment from ") + + jvm_lib_path; #if defined (__WIN32__) @@ -520,7 +525,8 @@ throw std::string ("unable to find JNI_CreateJavaVM in ") + jvm_lib_path; if (!get_vm) - throw std::string ("unable to find JNI_GetCreatedJavaVMs in ") + jvm_lib_path; + throw std::string ("unable to find JNI_GetCreatedJavaVMs in ") + + jvm_lib_path; if (get_vm (&jvm, 1, &nVMs) == 0 && nVMs > 0) @@ -537,7 +543,8 @@ { // At least one JVM exists, try to attach to it - switch (jvm->GetEnv (reinterpret_cast<void **> (¤t_env), JNI_VERSION_1_2)) + switch (jvm->GetEnv (reinterpret_cast<void **> (¤t_env), + JNI_VERSION_1_2)) { case JNI_EDETACHED: // Attach the current thread @@ -571,7 +578,8 @@ vm_args.add ("-Djava.class.path=" + initial_class_path ()); vm_args.add ("-Xrs"); vm_args.add ("-Djava.system.class.loader=org.octave.OctClassLoader"); - vm_args.read_java_opts (initial_java_dir () + file_ops::dir_sep_str () + "java.opts"); + vm_args.read_java_opts (initial_java_dir () + file_ops::dir_sep_str () + + "java.opts"); # if !defined (__APPLE__) && !defined (__MACH__) @@ -714,7 +722,8 @@ jstring_ref js (jni_env, jni_env->NewStringUTF ("octave.class.loader")); js = reinterpret_cast<jstring> (jni_env->CallStaticObjectMethod (syscls, mID, jstring (js))); class_loader = jstring_to_string (jni_env, jstring (js)); - std::replace (class_loader.begin (), class_loader.end (), '.', '/'); + std::replace (class_loader.begin (), class_loader.end (), + '.', '/'); } jclass_ref uicls (jni_env, jni_env->FindClass (class_loader.c_str ())); @@ -724,11 +733,13 @@ jni_env->ExceptionClear (); /* Try the netbeans way */ - std::replace (class_loader.begin (), class_loader.end (), '/', '.'); + std::replace (class_loader.begin (), class_loader.end (), + '/', '.'); jclass_ref jcls2 (jni_env, jni_env->FindClass ("org/openide/util/Lookup")); jmethodID mID = jni_env->GetStaticMethodID (jcls2, "getDefault", "()Lorg/openide/util/Lookup;"); jobject_ref lObj (jni_env, jni_env->CallStaticObjectMethod (jcls2, mID)); - mID = jni_env->GetMethodID (jcls2, "lookup", "(Ljava/lang/Class;)Ljava/lang/Object;"); + mID = jni_env->GetMethodID (jcls2, "lookup", + "(Ljava/lang/Class;)Ljava/lang/Object;"); jclass_ref cLoaderCls (jni_env, jni_env->FindClass ("java/lang/ClassLoader")); jobject_ref cLoader (jni_env, jni_env->CallObjectMethod (lObj, mID, jclass (cLoaderCls))); mID = jni_env->GetMethodID (cLoaderCls, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
--- a/libinterp/octave-value/ov-range.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/octave-value/ov-range.cc Wed Feb 25 11:55:49 2015 -0800 @@ -679,8 +679,8 @@ octave_value octave_range::fast_elem_extract (octave_idx_type n) const { - return (n < range.nelem ()) - ? octave_value (range.elem (n)) : octave_value (); + return (n < range.nelem ()) ? octave_value (range.elem (n)) + : octave_value (); } DEFUN (allow_noninteger_range_as_index, args, nargout,
--- a/libinterp/octave-value/ov-re-mat.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/octave-value/ov-re-mat.cc Wed Feb 25 11:55:49 2015 -0800 @@ -958,7 +958,7 @@ } default: - return octave_base_value::map (umap); + return octave_base_value::map (umap); } }
--- a/libinterp/octave-value/ov-usr-fcn.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/octave-value/ov-usr-fcn.h Wed Feb 25 11:55:49 2015 -0800 @@ -416,11 +416,11 @@ private: enum class_ctor_type - { - none, - legacy, - classdef - }; + { + none, + legacy, + classdef + }; // List of arguments for this function. These are local variables. tree_parameter_list *param_list;
--- a/libinterp/octave-value/ov.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/octave-value/ov.cc Wed Feb 25 11:55:49 2015 -0800 @@ -2405,29 +2405,29 @@ else dispatch_type = limit.class_name (); - octave_value meth = symbol_table::find_method ("colon", dispatch_type); - - if (meth.is_defined ()) - { - octave_value_list args; - - if (increment.is_defined ()) - { - args(2) = limit; - args(1) = increment; - } - else - args(1) = limit; - - args(0) = base; - - octave_value_list tmp = feval (meth.function_value (), args, 1); - - if (tmp.length () > 0) - retval = tmp(0); - } - else - error ("colon method not defined for %s class", dispatch_type.c_str ()); + octave_value meth = symbol_table::find_method ("colon", dispatch_type); + + if (meth.is_defined ()) + { + octave_value_list args; + + if (increment.is_defined ()) + { + args(2) = limit; + args(1) = increment; + } + else + args(1) = limit; + + args(0) = base; + + octave_value_list tmp = feval (meth.function_value (), args, 1); + + if (tmp.length () > 0) + retval = tmp(0); + } + else + error ("colon method not defined for %s class", dispatch_type.c_str ()); } else {
--- a/libinterp/operators/op-int.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/operators/op-int.h Wed Feb 25 11:55:49 2015 -0800 @@ -224,7 +224,7 @@ \ octave_value retval = octave_value (v2.T2 ## scalar_value () / v1.T1 ## scalar_value ()); \ return retval; \ - } \ + } #define OCTAVE_SS_INT_BOOL_OPS(PFX, T1, T2, Z1, Z2) \ DEFBINOP (PFX ## _el_and, T2, T2) \
--- a/libinterp/options-usage.h Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/options-usage.h Wed Feb 25 11:55:49 2015 -0800 @@ -65,7 +65,8 @@ #define PERSIST_OPTION 17 #define TEXI_MACROS_FILE_OPTION 18 #define TRADITIONAL_OPTION 19 -struct option long_opts[] = { +struct option long_opts[] = +{ { "braindead", no_argument, 0, TRADITIONAL_OPTION }, { "built-in-docstrings-file", required_argument, 0, BUILT_IN_DOCSTRINGS_FILE_OPTION }, { "debug", no_argument, 0, 'd' },
--- a/libinterp/parse-tree/pt-eval.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/parse-tree/pt-eval.cc Wed Feb 25 11:55:49 2015 -0800 @@ -705,7 +705,7 @@ if ((statement_context == script && ((Vecho_executing_commands & ECHO_SCRIPTS - && octave_call_stack::all_scripts ()) + && octave_call_stack::all_scripts ()) || Vecho_executing_commands & ECHO_FUNCTIONS)) || (statement_context == function && Vecho_executing_commands & ECHO_FUNCTIONS))
--- a/liboctave/array/Array-C.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/array/Array-C.cc Wed Feb 25 11:55:49 2015 -0800 @@ -58,8 +58,8 @@ { double xarg = arg (x); double yarg = arg (y); - xarg = (xarg == -M_PI) ? M_PI : xarg; - yarg = (yarg == -M_PI) ? M_PI : yarg; + xarg = (xarg == -M_PI) ? M_PI : xarg; + yarg = (yarg == -M_PI) ? M_PI : yarg; return xarg < yarg; } @@ -82,8 +82,8 @@ { double xarg = arg (x); double yarg = arg (y); - xarg = (xarg == -M_PI) ? M_PI : xarg; - yarg = (yarg == -M_PI) ? M_PI : yarg; + xarg = (xarg == -M_PI) ? M_PI : xarg; + yarg = (yarg == -M_PI) ? M_PI : yarg; return xarg > yarg; }
--- a/liboctave/array/Array-fC.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/array/Array-fC.cc Wed Feb 25 11:55:49 2015 -0800 @@ -58,8 +58,8 @@ { float xarg = arg (x); float yarg = arg (y); - xarg = (xarg == -M_PI) ? M_PI : xarg; - yarg = (yarg == -M_PI) ? M_PI : yarg; + xarg = (xarg == -M_PI) ? M_PI : xarg; + yarg = (yarg == -M_PI) ? M_PI : yarg; return xarg < yarg; } @@ -82,8 +82,8 @@ { float xarg = arg (x); float yarg = arg (y); - xarg = (xarg == -M_PI) ? M_PI : xarg; - yarg = (yarg == -M_PI) ? M_PI : yarg; + xarg = (xarg == -M_PI) ? M_PI : xarg; + yarg = (yarg == -M_PI) ? M_PI : yarg; return xarg > yarg; }
--- a/liboctave/array/Array.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/array/Array.cc Wed Feb 25 11:55:49 2015 -0800 @@ -2518,7 +2518,7 @@ { return Array<octave_idx_type> (); } \ \ template <> Array<T> \ -Array<T>::nth_element (const idx_vector&, int) const { return Array<T> (); } \ +Array<T>::nth_element (const idx_vector&, int) const { return Array<T> (); } template <class T>
--- a/liboctave/array/Array.h Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/array/Array.h Wed Feb 25 11:55:49 2015 -0800 @@ -497,7 +497,7 @@ //@{ //! Indexing with possible resizing and fill - // FIXME -- this is really a corner case, that should better be + // FIXME: this is really a corner case, that should better be // handled directly in liboctinterp. @@ -613,7 +613,8 @@ //! Find indices of (at most n) nonzero elements. If n is specified, //! backward specifies search from backward. - Array<octave_idx_type> find (octave_idx_type n = -1, bool backward = false) const; + Array<octave_idx_type> find (octave_idx_type n = -1, + bool backward = false) const; //! Returns the n-th element in increasing order, using the same //! ordering as used for sort. n can either be a scalar index or a
--- a/liboctave/array/PermMatrix.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/array/PermMatrix.cc Wed Feb 25 11:55:49 2015 -0800 @@ -85,13 +85,13 @@ PermMatrix::PermMatrix (const idx_vector& idx) : Array<octave_idx_type> () { - setup (idx, false, 0); + setup (idx, false, 0); } PermMatrix::PermMatrix (const idx_vector& idx, bool colp, octave_idx_type n) : Array<octave_idx_type> () { - setup (idx, colp, n); + setup (idx, colp, n); } PermMatrix::PermMatrix (octave_idx_type n)
--- a/liboctave/array/Sparse.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/array/Sparse.cc Wed Feb 25 11:55:49 2015 -0800 @@ -55,7 +55,7 @@ template <class T> Sparse<T>::Sparse (const PermMatrix& a) : rep (new typename Sparse<T>::SparseRep (a.rows (), a.cols (), a.rows ())), - dimensions (dim_vector (a.rows (), a.cols ())) + dimensions (dim_vector (a.rows (), a.cols ())) { octave_idx_type n = a.rows (); for (octave_idx_type i = 0; i <= n; i++) @@ -985,7 +985,7 @@ if (c > rep->ncols) std::fill_n (rep->c + rep->ncols + 1, c - rep->ncols, - rep->c[rep->ncols]); + rep->c[rep->ncols]); } rep->ncols = dimensions(1) = c; @@ -1913,9 +1913,9 @@ // ...tail std::copy (tmp.data () + ui, tmp.data () + nz, - data () + li + rnz); + data () + li + rnz); std::copy (tmp.ridx () + ui, tmp.ridx () + nz, - ridx () + li + rnz); + ridx () + li + rnz); } cidx (1) = new_nz; @@ -2104,9 +2104,9 @@ // ...tail. std::copy (tmp.data () + ui, tmp.data () + nz, - data () + li + rnz); + data () + li + rnz); std::copy (tmp.ridx () + ui, tmp.ridx () + nz, - ridx () + li + rnz); + ridx () + li + rnz); mx_inline_add (nc - ub, cidx () + ub + 1, tmp.cidx () + ub + 1, new_nz - nz); @@ -2157,18 +2157,18 @@ // from rhs octave_idx_type k = rhs.cidx (j); std::copy (rhs.data () + k, rhs.data () + k + u - l, - xdata () + l); + xdata () + l); std::copy (rhs.ridx () + k, rhs.ridx () + k + u - l, - xridx () + l); + xridx () + l); } else { // original octave_idx_type k = tmp.cidx (i); std::copy (tmp.data () + k, tmp.data () + k + u - l, - xdata () + l); + xdata () + l); std::copy (tmp.ridx () + k, tmp.ridx () + k + u - l, - xridx () + l); + xridx () + l); } }
--- a/liboctave/array/chMatrix.h Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/array/chMatrix.h Wed Feb 25 11:55:49 2015 -0800 @@ -58,14 +58,14 @@ charMatrix (const charMatrix& a) : charNDArray (a) { } - charMatrix (char c) : charNDArray (c) {} + charMatrix (char c) : charNDArray (c) { } - charMatrix (const char *s) : charNDArray (s) {} + charMatrix (const char *s) : charNDArray (s) { } - charMatrix (const std::string& s) : charNDArray (s) {} + charMatrix (const std::string& s) : charNDArray (s) { } charMatrix (const string_vector& s, char fill_value = '\0') - : charNDArray (s, fill_value) {} + : charNDArray (s, fill_value) { } bool operator == (const charMatrix& a) const; bool operator != (const charMatrix& a) const;
--- a/liboctave/array/dSparse.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/array/dSparse.cc Wed Feb 25 11:55:49 2015 -0800 @@ -7260,7 +7260,8 @@ solve_singularity_handler sing_handler) const { ComplexMatrix tmp (b); - return solve (tmp, info, rcond, sing_handler).column (static_cast<octave_idx_type> (0)); + return solve (tmp, info, rcond, + sing_handler).column (static_cast<octave_idx_type> (0)); } // other operations.
--- a/liboctave/array/dim-vector.h Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/array/dim-vector.h Wed Feb 25 11:55:49 2015 -0800 @@ -317,10 +317,10 @@ } //! Number of elements that a matrix with this dimensions would have. - /*! - Return the number of elements that a matrix with this dimension - vector would have, NOT the number of dimensions (elements in the - dimension vector). + /*! + Return the number of elements that a matrix with this dimension + vector would have, NOT the number of dimensions (elements in the + dimension vector). */ octave_idx_type numel (int n = 0) const @@ -335,14 +335,14 @@ return retval; } - /*! - The following function will throw a std::bad_alloc () - exception if the requested size is larger than can be indexed by - octave_idx_type. This may be smaller than the actual amount of - memory that can be safely allocated on a system. However, if we - don't fail here, we can end up with a mysterious crash inside a - function that is iterating over an array using octave_idx_type - indices. + /*! + The following function will throw a std::bad_alloc () + exception if the requested size is larger than can be indexed by + octave_idx_type. This may be smaller than the actual amount of + memory that can be safely allocated on a system. However, if we + don't fail here, we can end up with a mysterious crash inside a + function that is iterating over an array using octave_idx_type + indices. */ octave_idx_type safe_numel (void) const;
--- a/liboctave/numeric/bsxfun-decl.h Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/numeric/bsxfun-decl.h Wed Feb 25 11:55:49 2015 -0800 @@ -54,6 +54,6 @@ BSXFUN_REL_DECL (lt, ARRAY, API) \ BSXFUN_REL_DECL (le, ARRAY, API) \ BSXFUN_REL_DECL (gt, ARRAY, API) \ - BSXFUN_REL_DECL (ge, ARRAY, API) \ + BSXFUN_REL_DECL (ge, ARRAY, API) #endif
--- a/liboctave/numeric/bsxfun-defs.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/numeric/bsxfun-defs.cc Wed Feb 25 11:55:49 2015 -0800 @@ -239,7 +239,7 @@ BSXFUN_OP_DEF_MXLOOP (mul, ARRAY, mx_inline_mul) \ BSXFUN_OP_DEF_MXLOOP (div, ARRAY, mx_inline_div) \ BSXFUN_OP_DEF_MXLOOP (min, ARRAY, mx_inline_xmin) \ - BSXFUN_OP_DEF_MXLOOP (max, ARRAY, mx_inline_xmax) \ + BSXFUN_OP_DEF_MXLOOP (max, ARRAY, mx_inline_xmax) #define BSXFUN_STDREL_DEFS_MXLOOP(ARRAY) \ BSXFUN_REL_DEF_MXLOOP (eq, ARRAY, mx_inline_eq) \
--- a/liboctave/numeric/oct-norm.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/numeric/oct-norm.cc Wed Feb 25 11:55:49 2015 -0800 @@ -77,20 +77,20 @@ template<class U> void accum (U val) - { - octave_quit (); - R t = std::abs (val); - if (scl == t) // we need this to handle Infs properly + { + octave_quit (); + R t = std::abs (val); + if (scl == t) // we need this to handle Infs properly + sum += 1; + else if (scl < t) + { + sum *= std::pow (scl/t, p); sum += 1; - else if (scl < t) - { - sum *= std::pow (scl/t, p); - sum += 1; - scl = t; - } - else if (t != 0) - sum += std::pow (t/scl, p); - } + scl = t; + } + else if (t != 0) + sum += std::pow (t/scl, p); + } operator R () { return scl * std::pow (sum, 1/p); } }; @@ -105,20 +105,20 @@ template<class U> void accum (U val) - { - octave_quit (); - R t = 1 / std::abs (val); - if (scl == t) + { + octave_quit (); + R t = 1 / std::abs (val); + if (scl == t) + sum += 1; + else if (scl < t) + { + sum *= std::pow (scl/t, p); sum += 1; - else if (scl < t) - { - sum *= std::pow (scl/t, p); - sum += 1; - scl = t; - } - else if (t != 0) - sum += std::pow (t/scl, p); - } + scl = t; + } + else if (t != 0) + sum += std::pow (t/scl, p); + } operator R () { return scl * std::pow (sum, -1/p); } }; @@ -132,25 +132,25 @@ norm_accumulator_2 () : scl(0), sum(1) {} void accum (R val) - { - R t = std::abs (val); - if (scl == t) + { + R t = std::abs (val); + if (scl == t) + sum += 1; + else if (scl < t) + { + sum *= pow2 (scl/t); sum += 1; - else if (scl < t) - { - sum *= pow2 (scl/t); - sum += 1; - scl = t; - } - else if (t != 0) - sum += pow2 (t/scl); - } + scl = t; + } + else if (t != 0) + sum += pow2 (t/scl); + } void accum (std::complex<R> val) - { - accum (val.real ()); - accum (val.imag ()); - } + { + accum (val.real ()); + accum (val.imag ()); + } operator R () { return scl * std::sqrt (sum); } }; @@ -164,9 +164,9 @@ norm_accumulator_1 () : sum (0) {} template<class U> void accum (U val) - { - sum += std::abs (val); - } + { + sum += std::abs (val); + } operator R () { return sum; } }; @@ -179,9 +179,9 @@ norm_accumulator_inf () : max (0) {} template<class U> void accum (U val) - { - max = std::max (max, std::abs (val)); - } + { + max = std::max (max, std::abs (val)); + } operator R () { return max; } }; @@ -194,9 +194,9 @@ norm_accumulator_minf () : min (octave_Inf) {} template<class U> void accum (U val) - { - min = std::min (min, std::abs (val)); - } + { + min = std::min (min, std::abs (val)); + } operator R () { return min; } }; @@ -209,9 +209,9 @@ norm_accumulator_0 () : num (0) {} template<class U> void accum (U val) - { - if (val != static_cast<U> (0)) ++num; - } + { + if (val != static_cast<U> (0)) ++num; + } operator R () { return num; } };
--- a/liboctave/operators/Sparse-op-defs.h Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/operators/Sparse-op-defs.h Wed Feb 25 11:55:49 2015 -0800 @@ -971,7 +971,7 @@ #define SPARSE_SMSM_BOOL_OPS2(M1, M2, LHS_ZERO, RHS_ZERO) \ SPARSE_SMSM_BOOL_OP (mx_el_and, &&, M1, M2, LHS_ZERO, RHS_ZERO) \ - SPARSE_SMSM_BOOL_OP (mx_el_or, ||, M1, M2, LHS_ZERO, RHS_ZERO) \ + SPARSE_SMSM_BOOL_OP (mx_el_or, ||, M1, M2, LHS_ZERO, RHS_ZERO) #define SPARSE_SMSM_BOOL_OPS(M1, M2, ZERO) \ SPARSE_SMSM_BOOL_OPS2(M1, M2, ZERO, ZERO) @@ -1177,7 +1177,7 @@ #define SPARSE_MSM_BOOL_OPS2(M1, M2, LHS_ZERO, RHS_ZERO) \ SPARSE_MSM_BOOL_OP (mx_el_and, &&, M1, M2, LHS_ZERO, RHS_ZERO) \ - SPARSE_MSM_BOOL_OP (mx_el_or, ||, M1, M2, LHS_ZERO, RHS_ZERO) \ + SPARSE_MSM_BOOL_OP (mx_el_or, ||, M1, M2, LHS_ZERO, RHS_ZERO) #define SPARSE_MSM_BOOL_OPS(M1, M2, ZERO) \ SPARSE_MSM_BOOL_OPS2(M1, M2, ZERO, ZERO) @@ -1390,7 +1390,7 @@ #define SPARSE_SMM_BOOL_OPS2(M1, M2, LHS_ZERO, RHS_ZERO) \ SPARSE_SMM_BOOL_OP (mx_el_and, &&, M1, M2, LHS_ZERO, RHS_ZERO) \ - SPARSE_SMM_BOOL_OP (mx_el_or, ||, M1, M2, LHS_ZERO, RHS_ZERO) \ + SPARSE_SMM_BOOL_OP (mx_el_or, ||, M1, M2, LHS_ZERO, RHS_ZERO) #define SPARSE_SMM_BOOL_OPS(M1, M2, ZERO) \ SPARSE_SMM_BOOL_OPS2(M1, M2, ZERO, ZERO) @@ -1665,7 +1665,7 @@ // we are looping over the rows and not the columns in the inner loop. #define SPARSE_ANY_ALL_OP_ROW_CODE(TEST_OP, TEST_TRUE_VAL) \ if (data (i) TEST_OP 0.0) \ - tmp[ridx (i)] = TEST_TRUE_VAL; \ + tmp[ridx (i)] = TEST_TRUE_VAL; #define SPARSE_ANY_ALL_OP_COL_CODE(TEST_OP, TEST_TRUE_VAL) \ if (data (i) TEST_OP 0.0) \
--- a/liboctave/util/oct-inttypes.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/util/oct-inttypes.cc Wed Feb 25 11:55:49 2015 -0800 @@ -767,7 +767,7 @@ template OCTAVE_API octave_int<T> powf (const float&, const octave_int<T>&); \ template OCTAVE_API octave_int<T> powf (const octave_int<T>&, const float&); \ template OCTAVE_API octave_int<T> \ - bitshift (const octave_int<T>&, int, const octave_int<T>&); \ + bitshift (const octave_int<T>&, int, const octave_int<T>&); INSTANTIATE_INTTYPE (int8_t); INSTANTIATE_INTTYPE (int16_t);
--- a/liboctave/util/oct-inttypes.h Wed Feb 25 16:23:45 2015 +0100 +++ b/liboctave/util/oct-inttypes.h Wed Feb 25 11:55:49 2015 -0800 @@ -1144,7 +1144,7 @@ template <class T> \ inline octave_int<T> \ operator OP (const double& x, const octave_int<T>& y) \ - { return octave_int<T> (x OP static_cast<double> (y)); } \ + { return octave_int<T> (x OP static_cast<double> (y)); } #ifdef OCTAVE_INT_USE_LONG_DOUBLE // Handle mixed op using long double
--- a/src/main.in.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/src/main.in.cc Wed Feb 25 11:55:49 2015 -0800 @@ -273,8 +273,8 @@ std::string dir = octave_getenv ("OCTAVE_ARCHLIBDIR"); - return dir.empty () - ? subst_octave_home (std::string (OCTAVE_ARCHLIBDIR)) : dir; + return dir.empty () ? subst_octave_home (std::string (OCTAVE_ARCHLIBDIR)) + : dir; } // Adapted from libtool wrapper.
--- a/src/mkoctfile.in.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/src/mkoctfile.in.cc Wed Feb 25 11:55:49 2015 -0800 @@ -167,7 +167,7 @@ vars["DEPEND_FLAGS"] = get_variable ("DEPEND_FLAGS", %OCTAVE_CONF_DEPEND_FLAGS%); vars["DEPEND_EXTRA_SED_PATTERN"] = get_variable ("DEPEND_EXTRA_SED_PATTERN", - %OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%); + %OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%); vars["DL_LD"] = get_variable ("DL_LD", %OCTAVE_CONF_MKOCTFILE_DL_LD%); vars["DL_LDFLAGS"] = get_variable ("DL_LDFLAGS", @@ -593,9 +593,11 @@ std::string f = *it, dfile = basename (f, true) + ".d", line; gnulib::unlink (dfile.c_str ()); - std::string cmd = vars["CC"] + " " + vars["DEPEND_FLAGS"] + " " - + vars["CPPFLAGS"] + " " + vars["ALL_CFLAGS"] + " " - + incflags + " " + defs + " " + quote_path (f); + std::string cmd = vars["CC"] + " " + + vars["DEPEND_FLAGS"] + " " + + vars["CPPFLAGS"] + " " + + vars["ALL_CFLAGS"] + " " + + incflags + " " + defs + " " + quote_path (f); FILE *fd = popen (cmd.c_str (), "r"); std::ofstream fo (dfile.c_str ()); @@ -607,8 +609,9 @@ { size_t spos = line.rfind ('/', pos); std::string ofile = - (spos == std::string::npos ? line.substr (0, pos+2) - : line.substr (spos+1, pos-spos+1)); + (spos == std::string::npos + ? line.substr (0, pos+2) + : line.substr (spos+1, pos-spos+1)); fo << "pic/" << ofile << " " << ofile << " " << dfile << line.substr (pos) << std::endl; } @@ -624,9 +627,11 @@ std::string f = *it, dfile = basename (f, true) + ".d", line; gnulib::unlink (dfile.c_str ()); - std::string cmd = vars["CC"] + " " + vars["DEPEND_FLAGS"] + " " - + vars["CPPFLAGS"] + " " + vars["ALL_CXXFLAGS"] + " " - + incflags + " " + defs + " " + quote_path (f); + std::string cmd = vars["CC"] + " " + + vars["DEPEND_FLAGS"] + " " + + vars["CPPFLAGS"] + " " + + vars["ALL_CXXFLAGS"] + " " + + incflags + " " + defs + " " + quote_path (f); FILE *fd = popen (cmd.c_str (), "r"); std::ofstream fo (dfile.c_str ()); @@ -638,8 +643,9 @@ { size_t spos = line.rfind ('/', pos); std::string ofile = - (spos == std::string::npos ? line.substr (0, pos+2) - : line.substr (spos+1, pos-spos+1)); + (spos == std::string::npos + ? line.substr (0, pos+2) + : line.substr (spos+1, pos-spos+1)); fo << "pic/" << ofile << " " << ofile << " " << dfile << line.substr (pos+2) << std::endl; } @@ -669,9 +675,11 @@ else o = b + ".o"; objfiles += (" " + o); - std::string cmd = vars["F77"] + " -c " + vars["FPICFLAG"] + " " - + vars["ALL_FFLAGS"] + " " + incflags + " " + defs + " " - + pass_on_options + " " + f + " -o " + o; + std::string cmd = vars["F77"] + " -c " + + vars["FPICFLAG"] + " " + + vars["ALL_FFLAGS"] + " " + + incflags + " " + defs + " " + pass_on_options + + " " + f + " -o " + o; result = run_command (cmd); } else @@ -698,10 +706,12 @@ else o = b + ".o"; objfiles += (" " + o); - std::string cmd = vars["CC"] + " -c " + vars["CPPFLAGS"] + " " - + vars["CPICFLAG"] + " " + vars["ALL_CFLAGS"] + " " - + pass_on_options + " " + incflags + " " + defs + " " - + quote_path (f) + " -o " + quote_path (o); + std::string cmd = vars["CC"] + " -c " + + vars["CPPFLAGS"] + " " + + vars["CPICFLAG"] + " " + vars["ALL_CFLAGS"] + " " + + pass_on_options + " " + + incflags + " " + defs + " " + + quote_path (f) + " -o " + quote_path (o); result = run_command (cmd); } else @@ -728,10 +738,13 @@ else o = b + ".o"; objfiles += (" " + o); - std::string cmd = vars["CXX"] + " -c " + vars["CPPFLAGS"] + " " - + vars["CXXPICFLAG"] + " " + vars["ALL_CXXFLAGS"] + " " - + pass_on_options + " " + incflags + " " + defs + " " - + quote_path (f) + " -o " + quote_path (o); + std::string cmd = vars["CXX"] + " -c " + + vars["CPPFLAGS"] + " " + + vars["CXXPICFLAG"] + " " + + vars["ALL_CXXFLAGS"] + " " + + pass_on_options + " " + + incflags + " " + defs + " " + + quote_path (f) + " -o " + quote_path (o); result = run_command (cmd); } else @@ -748,15 +761,17 @@ { if (!vars["LD_CXX"].empty ()) { - std::string cmd = vars["LD_CXX"] + " " + vars["CPPFLAGS"] + " " - + vars["ALL_CXXFLAGS"] + " " + vars["RDYNAMIC_FLAG"] - + " " + vars["ALL_LDFLAGS"] + " " - + pass_on_options + " " + output_option + " " - + objfiles + " " + libfiles + " " - + ldflags + " " + vars["LFLAGS"] - + " -loctinterp -loctave " - + " " + vars["OCTAVE_LINK_OPTS"] - + " " + vars["OCTAVE_LINK_DEPS"]; + std::string cmd = vars["LD_CXX"] + " " + + vars["CPPFLAGS"] + " " + + vars["ALL_CXXFLAGS"] + " " + + vars["RDYNAMIC_FLAG"] + " " + + vars["ALL_LDFLAGS"] + " " + + pass_on_options + " " + output_option + " " + + objfiles + " " + libfiles + " " + + ldflags + " " + vars["LFLAGS"] + + " -loctinterp -loctave " + + " " + vars["OCTAVE_LINK_OPTS"] + + " " + vars["OCTAVE_LINK_DEPS"]; result = run_command (cmd); } else @@ -769,11 +784,15 @@ } else { - std::string cmd = vars["DL_LD"] + " " + vars["DL_LDFLAGS"] + " " - + pass_on_options + " -o " + octfile + " " - + objfiles + " " + libfiles + " " + ldflags + " " - + vars["LFLAGS"] + " -loctinterp -loctave " - + vars["OCT_LINK_OPTS"] + " " + vars["OCT_LINK_DEPS"]; + std::string cmd = vars["DL_LD"] + " " + + vars["DL_LDFLAGS"] + " " + + pass_on_options + + " -o " + octfile + " " + + objfiles + " " + libfiles + " " + + ldflags + " " + + vars["LFLAGS"] + " -loctinterp -loctave " + + vars["OCT_LINK_OPTS"] + " " + + vars["OCT_LINK_DEPS"]; result = run_command (cmd); }